Removed CUDA 10.2 wheel job from CI.

facebookresearch · Nov 8, 2022 · db77552 · db77552
1 parent 256c483
commit db77552
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -32,7 +32,7 @@ update_and_install_python: &update_and_install_python
       command: |
         sudo add-apt-repository -y ppa:deadsnakes/ppa
         sudo apt-get update
-        sudo apt-get install -y python3.7 python3.7-dev python3.8 python3.8-dev python3.9 python3.9-dev
+        sudo apt-get install -y python3.9 python3.9-dev
 
 install_nox: &install_nox
   - run:
@@ -290,26 +290,15 @@ jobs:
       - <<: *setup_project
       - <<: *run_tests
 
-  test_cuda10_wheel:
-    executor: gpu_cuda10
-    steps:
-      - checkout
-      - <<: *update_and_install_python
-      - <<: *install_suitesparse
-      - <<: *setup_cuda11_libs
-      - <<: *setup_environment
-      - <<: *build_cuda10_wheel
-      - <<: *run_tests_from_wheel
-
   test_cuda11_wheel:
     executor: gpu_cuda11
     steps:
       - checkout
       - <<: *update_and_install_python
-      - <<: *install_suitesparse
       - <<: *setup_cuda11_libs
-      - <<: *setup_environment
       - <<: *build_cuda11_wheel
+      - <<: *install_suitesparse
+      - <<: *setup_environment
       - <<: *run_tests_from_wheel
 
 
@@ -323,5 +312,4 @@ workflows:
       - py39_linux
       - unittests_gpu17_cuda10
       - unittests_gpu17_cuda11
-      - test_cuda10_wheel
       - test_cuda11_wheel
diff --git a/build_scripts/build_wheel.sh b/build_scripts/build_wheel.sh
@@ -76,21 +76,6 @@ for PYTHON_VERSION in 3.9; do
     echo """# ----------------
     FROM ${IMAGE_NAME}
 
-    # --- Install conda and environment
-    ENV CONDA_DIR /opt/conda
-    RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
-        /bin/bash ~/miniconda.sh -b -p /opt/conda
-    ENV PATH \$CONDA_DIR/bin:\$PATH
-    RUN conda create --name theseus python=${PYTHON_VERSION}
-    RUN source activate theseus
-
-    # --- Install torch
-    ENV CUDA_HOME /usr/local/cuda-${CUDA_VERSION}
-    RUN pip install ${TORCH_VERSION} --extra-index-url https://download.pytorch.org/whl/${DEVICE_TAG}
-
-    # --- Install sparse suitesparse
-    RUN conda install -c conda-forge suitesparse
-
     # --- Install baspacho dependencies (cmake, BLAS)
     RUN wget --quiet https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.sh -O ~/cmake3.24.sh
     RUN mkdir /opt/cmake3.24
@@ -101,7 +86,6 @@ for PYTHON_VERSION in 3.9; do
     # --- Install baspacho
     RUN git clone https://github.com/facebookresearch/baspacho.git
     WORKDIR baspacho
-
     # Note: to use static BLAS the option is really BLA_STATIC (https://cmake.org/cmake/help/latest/module/FindBLAS.html)
     RUN /opt/cmake3.24/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DBLA_STATIC=ON \
         ${BASPACHO_CUDA_ARGS} \
@@ -110,6 +94,21 @@ for PYTHON_VERSION in 3.9; do
     RUN /opt/cmake3.24/bin/cmake --build build -- -j16
     WORKDIR ..
 
+    # --- Install conda and environment
+    ENV CONDA_DIR /opt/conda
+    RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \
+        /bin/bash ~/miniconda.sh -b -p /opt/conda
+    ENV PATH \$CONDA_DIR/bin:\$PATH
+    RUN conda create --name theseus python=${PYTHON_VERSION}
+    RUN source activate theseus
+
+    # --- Install torch
+    ENV CUDA_HOME /usr/local/cuda-${CUDA_VERSION}
+    RUN pip install ${TORCH_VERSION} --extra-index-url https://download.pytorch.org/whl/${DEVICE_TAG}
+
+    # --- Install sparse suitesparse
+    RUN conda install -c conda-forge suitesparse
+
     # --- Compile theseus wheel
     RUN pip install build wheel
     RUN git clone https://github.com/facebookresearch/theseus.git