diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh index 54339e5efbbde..ceec05a5735bd 100755 --- a/.ci/docker/build.sh +++ b/.ci/docker/build.sh @@ -288,7 +288,6 @@ case "$tag" in ;; *) # Catch-all for builds that are not hardcoded. - PROTOBUF=yes VISION=yes echo "image '$image' did not match an existing build configuration" if [[ "$image" == *py* ]]; then @@ -303,7 +302,6 @@ case "$tag" in TRITON=yes # To ensure that any ROCm config will build using conda cmake # and thus have LAPACK/MKL enabled - CONDA_CMAKE=yes fi if [[ "$image" == *centos7* ]]; then NINJA_VERSION=1.10.2 @@ -320,9 +318,6 @@ case "$tag" in if [[ "$image" == *glibc* ]]; then extract_version_from_image_name glibc GLIBC_VERSION fi - if [[ "$image" == *cmake* ]]; then - extract_version_from_image_name cmake CMAKE_VERSION - fi ;; esac @@ -345,7 +340,6 @@ docker build \ ${no_cache_flag} \ ${progress_flag} \ --build-arg "BUILD_ENVIRONMENT=${image}" \ - --build-arg "PROTOBUF=${PROTOBUF:-}" \ --build-arg "LLVMDEV=${LLVMDEV:-}" \ --build-arg "VISION=${VISION:-}" \ --build-arg "UBUNTU_VERSION=${UBUNTU_VERSION}" \ @@ -357,7 +351,6 @@ docker build \ --build-arg "PYTHON_VERSION=${PYTHON_VERSION}" \ --build-arg "GCC_VERSION=${GCC_VERSION}" \ --build-arg "CUDA_VERSION=${CUDA_VERSION}" \ - --build-arg "CMAKE_VERSION=${CMAKE_VERSION:-}" \ --build-arg "NINJA_VERSION=${NINJA_VERSION:-}" \ --build-arg "KATEX=${KATEX:-}" \ --build-arg "ROCM_VERSION=${ROCM_VERSION:-}" \ @@ -365,7 +358,6 @@ docker build \ --build-arg "IMAGE_NAME=${IMAGE_NAME}" \ --build-arg "UCX_COMMIT=${UCX_COMMIT}" \ --build-arg "UCC_COMMIT=${UCC_COMMIT}" \ - --build-arg "CONDA_CMAKE=${CONDA_CMAKE}" \ --build-arg "TRITON=${TRITON}" \ --build-arg "TRITON_CPU=${TRITON_CPU}" \ --build-arg "ONNX=${ONNX}" \ @@ -454,9 +446,9 @@ HAS_TRITON=$(drun python -c "import triton" > /dev/null 2>&1 && echo "yes" || ec if [[ -n "$TRITON" || -n "$TRITON_CPU" ]]; then if [ "$HAS_TRITON" = "no" ]; then echo "expecting triton to be installed, but it is not" - exit 0 + exit 1 fi elif [ "$HAS_TRITON" = "yes" ]; then echo "expecting triton to not be installed, but it is" - exit 0 + exit 1 fi diff --git a/.ci/docker/centos-rocm/Dockerfile b/.ci/docker/centos-rocm/Dockerfile index 3d35bb79c7b8d..ebb2fd138d4e5 100644 --- a/.ci/docker/centos-rocm/Dockerfile +++ b/.ci/docker/centos-rocm/Dockerfile @@ -48,7 +48,6 @@ COPY ./common/install_conda.sh install_conda.sh COPY ./common/common_utils.sh common_utils.sh RUN bash ./install_conda.sh && rm install_conda.sh common_utils.sh /opt/conda/requirements-ci.txt - # (optional) Install vision packages like OpenCV ARG VISION COPY ./common/install_vision.sh ./common/cache_vision_models.sh ./common/common_utils.sh ./ @@ -82,7 +81,6 @@ ENV MAGMA_HOME /opt/rocm/magma ENV LANG en_US.utf8 ENV LC_ALL en_US.utf8 - # (optional) Install non-default Ninja version ARG NINJA_VERSION COPY ./common/install_ninja.sh install_ninja.sh @@ -98,7 +96,7 @@ COPY ./common/install_triton.sh install_triton.sh COPY ./common/common_utils.sh common_utils.sh COPY ci_commit_pins/triton.txt triton.txt COPY triton_version.txt triton_version.txt -#RUN if [ -n "${TRITON}" ]; then bash ./install_triton.sh; fi +RUN if [ -n "${TRITON}" ]; then bash ./install_triton.sh; fi RUN rm install_triton.sh common_utils.sh triton.txt triton_version.txt # Install ccache/sccache (do this last, so we get priority in PATH)