From 33fe33a4769e7cc1b9dae723c5a9382f5d07cea0 Mon Sep 17 00:00:00 2001 From: Pedro Pedreira Date: Wed, 13 Mar 2024 18:35:21 -0700 Subject: [PATCH] Disable CI jobs that relied on torcharrow scripts (#9013) Summary: Since we recently removed the legacy setup-velox-torcharrow.sh script, we also need to cleanup some other references to it. For now, disabling jobs that used that docker container. Pull Request resolved: https://github.com/facebookincubator/velox/pull/9013 Reviewed By: xiaoxmeng, kgpai Differential Revision: D54878322 Pulled By: pedroerp fbshipit-source-id: f909b0cd7841d556dde6fd9f0e7424aa52cab7ad --- .github/workflows/build_pyvelox.yml | 2 ++ .github/workflows/docker.yml | 4 ---- Makefile | 3 --- docker-compose.yml | 20 -------------------- scripts/velox-torcharrow-container.dockfile | 21 --------------------- 5 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 scripts/velox-torcharrow-container.dockfile diff --git a/.github/workflows/build_pyvelox.yml b/.github/workflows/build_pyvelox.yml index 44e89a039893..4ebd5dd17319 100644 --- a/.github/workflows/build_pyvelox.yml +++ b/.github/workflows/build_pyvelox.yml @@ -46,6 +46,8 @@ concurrency: cancel-in-progress: true jobs: + # TODO: https://github.com/facebookincubator/velox/issues/9014 + if: false build_wheels: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d3d309c664b6..d67d58bc8a8b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -52,10 +52,6 @@ jobs: file: "scripts/circleci-container.dockfile" args: "cpu_target=avx" tags: "ghcr.io/facebookincubator/velox-dev:circleci-avx" - - name: Torcharrow - file: "scripts/velox-torcharrow-container.dockfile" - args: "cpu_target=avx" - tags: "ghcr.io/facebookincubator/velox-dev:torcharrow-avx" - name: Dev file: "scripts/ubuntu-22.04-cpp.dockerfile" args: "" diff --git a/Makefile b/Makefile index 82de59432436..252aa8ce4304 100644 --- a/Makefile +++ b/Makefile @@ -167,9 +167,6 @@ circleci-container: #: Build the linux container for CircleCi check-container: $(MAKE) linux-container CONTAINER_NAME=check -velox-torcharrow-container: - $(MAKE) linux-container CONTAINER_NAME=velox-torcharrow - linux-container: rm -rf /tmp/docker && \ mkdir -p /tmp/docker && \ diff --git a/docker-compose.yml b/docker-compose.yml index 45c64314b8b9..3bd7440606d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,26 +51,6 @@ services: - .:/velox:delegated command: /bin/bash -c "scl enable gcc-toolset-9 '/velox/scripts/docker-command.sh'" - python: - # Usage: - # docker-compose pull ubuntu-cpp or docker-compose build ubuntu-cpp - # docker-compose run --rm ubuntu-cpp - # or - # docker-compose run -e NUM_THREADS= --rm ubuntu-cpp - # to set the number of threads used during compilation - image: ghcr.io/facebookincubator/velox-dev:torcharrow-avx - build: - context: . - dockerfile: scripts/velox-torcharrow-container.dockfile - environment: - PYTHON_EXECUTABLE: python3.7 - NUM_THREADS: 8 # default value for NUM_THREADS - CCACHE_DIR: "/velox/.ccache" - volumes: - - .:/velox:delegated - command: cd /velox && make python-test - - presto-java: # Usage: # docker-compose pull presto-java or docker-compose build presto-java diff --git a/scripts/velox-torcharrow-container.dockfile b/scripts/velox-torcharrow-container.dockfile deleted file mode 100644 index 7d3ce467a007..000000000000 --- a/scripts/velox-torcharrow-container.dockfile +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) Facebook, Inc. and its affiliates. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Build container to be used for TorchArrow. - -FROM quay.io/pypa/manylinux2014_x86_64 -ARG cpu_target -COPY scripts/setup-velox-torcharrow.sh / -COPY scripts/setup-helper-functions.sh / -RUN mkdir build && ( cd build && CPU_TARGET="$cpu_target" bash /setup-velox-torcharrow.sh ) && rm -rf build