From 5b901e34e3a3cb898828b79f8ae08fd0c1a6b68a Mon Sep 17 00:00:00 2001 From: hinriksnaer Date: Sat, 9 May 2026 19:38:06 -0400 Subject: [PATCH] dead code removal --- .devcontainer/devcontainer.md | 2 +- .github/workflows/cpu-image.yml | 2 -- .github/workflows/cuda-image.yml | 1 - .github/workflows/rocm-image.yml | 1 - .yamllint.yml | 3 --- Makefile | 22 ---------------------- README.md | 4 ++-- dockerfiles/Dockerfile | 2 +- 8 files changed, 4 insertions(+), 33 deletions(-) diff --git a/.devcontainer/devcontainer.md b/.devcontainer/devcontainer.md index 3d8cc76..69f9db8 100644 --- a/.devcontainer/devcontainer.md +++ b/.devcontainer/devcontainer.md @@ -90,7 +90,7 @@ This option clones the entire `triton-dev-containers` repository. ```bash git clone https://github.com/redhat-et/triton-dev-containers.git cd triton-dev-containers -make devcontainers +make -C .devcontainer generate ``` ### Launch VSCode Dev Container diff --git a/.github/workflows/cpu-image.yml b/.github/workflows/cpu-image.yml index 4868494..d6a1618 100644 --- a/.github/workflows/cpu-image.yml +++ b/.github/workflows/cpu-image.yml @@ -44,8 +44,6 @@ jobs: image-name: cpu image-tag: centos9 dockerfile: dockerfiles/Dockerfile.cpu - build-args: | - USERNAME=triton platforms: linux/amd64 secrets: qt_username: ${{ secrets.qt_username }} diff --git a/.github/workflows/cuda-image.yml b/.github/workflows/cuda-image.yml index 7b4df8b..a1a88b4 100644 --- a/.github/workflows/cuda-image.yml +++ b/.github/workflows/cuda-image.yml @@ -45,7 +45,6 @@ jobs: image-tag: 12-9-centos9 dockerfile: dockerfiles/Dockerfile.cuda build-args: | - USERNAME=triton BUILD_CUDA_VERSION=12-9 platforms: linux/amd64 secrets: diff --git a/.github/workflows/rocm-image.yml b/.github/workflows/rocm-image.yml index 522899f..d37a81e 100644 --- a/.github/workflows/rocm-image.yml +++ b/.github/workflows/rocm-image.yml @@ -45,7 +45,6 @@ jobs: image-tag: 7.1.1-centos9 dockerfile: dockerfiles/Dockerfile.rocm build-args: | - USERNAME=triton BUILD_ROCM_VERSION=7.1.1 BUILD_ROCM_RHEL_VERSION=9.7 platforms: linux/amd64 diff --git a/.yamllint.yml b/.yamllint.yml index 3b34722..ff7f93e 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -5,6 +5,3 @@ rules: document-start: disable comments: min-spaces-from-content: 1 -ignore: - - builddir/* - - .clang-format diff --git a/Makefile b/Makefile index 2e8fab5..1ed2f7e 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,6 @@ IMAGE_REPO = quay.io/triton-dev-containers BASE_IMAGE_NAME = base CPU_IMAGE_NAME = cpu CUDA_IMAGE_NAME = cuda -GOSU_IMAGE_NAME = gosu ROCM_IMAGE_NAME = rocm # Image tags @@ -59,13 +58,11 @@ IMAGE_TAG := centos$(CENTOS_VERSION) BASE_IMAGE_TAG := $(IMAGE_TAG) CPU_IMAGE_TAG := $(IMAGE_TAG) CUDA_IMAGE_TAG := $(CUDA_VERSION)-$(IMAGE_TAG) -GOSU_IMAGE_TAG := $(GOSU_VERSION)-$(IMAGE_TAG) ROCM_IMAGE_TAG := $(ROCM_VERSION)-$(IMAGE_TAG) # ------------------------------------------------------------------------------ # Runtime configuration # ------------------------------------------------------------------------------ -RUNTIME_ARGS ?= # Set the max number of jobs to use when building a framework # Use a lower value to decrease ram usage during a build @@ -138,16 +135,6 @@ define build-image $(3) -f $(4) . endef -# Old build targets (DEPRECATED) -.PHONY: triton-image -triton-image: cuda-image - -.PHONY: triton-cpu-image -triton-cpu-image: cpu-image - -.PHONY: triton-amd-image -triton-amd-image: rocm-image - .PHONY: build-images build-images: cuda-image cpu-image rocm-image ## Build all container images @@ -287,15 +274,6 @@ define ROCM_RUNTIME_ARGS -o ROCM_VERSION=$(ROCM_VERSION) endef - -# Old runtime targets (DEPRECATED) -.PHONY: triton-run -triton-run: triton-cuda-run - -.PHONY: triton-amd-run -triton-amd-run: triton-rocm-run - - .PHONY: base-run base-run: ## Run the Base container image @./triton-dev-containers.sh $(RUNTIME_ARGS) -d $(BASE_IMAGE_NAME) diff --git a/README.md b/README.md index 7085379..27b5387 100644 --- a/README.md +++ b/README.md @@ -366,11 +366,11 @@ The packages installed at startup time can be found in Use the `devsetup` script [devsetup.sh](./scripts/devsetup.sh) to run the initial container configuration, like user creation and base software -installation. It will also run the `devsetup_` scripts if the +installation. It will also run the `devinstall_` scripts if the `INSTALL_` variables have been set. By default they are all set to `skip` and won't be run. -Use the `devsetup_` scripts to install or setup the container to +Use the `devinstall_` scripts to install or setup the container to build the target source. Framework refers to triton, helion, torch, llvm, and vllm. The scripts can install the wheel packages or download the source and install build dependencies. diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 029dfc9..db3b315 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -14,7 +14,7 @@ # # SPDX-License-Identifier: Apache-2.0 -ARG CENTOS_VERSION=10 +ARG CENTOS_VERSION=9 FROM quay.io/centos/centos:stream${CENTOS_VERSION}-minimal AS gosu USER 0