Removed CUDA 10.2 wheel job from CI.

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

Hide file tree

Showing 2 changed files with 17 additions and 41 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:
@@ -176,17 +176,6 @@ run_tests: &run_tests
         pytest -s tests/test_theseus_layer.py
         pytest -s tests -m "cudaext"
 
-build_cuda10_wheel: &build_cuda10_wheel
-  - run:
-      name: Building wheel for CUDA 10
-      working_directory: /home/circleci
-      command: |
-        THESEUS_GIT_COMMIT=$(git --git-dir project/.git log --format="%H" -n 1)
-        THESEUS_VERSION=$(grep -Eo  "[0-9].[0-9].[0-9][.0-9a-z]*" project/theseus/__init__.py)
-        ./project/build_scripts/build_wheel.sh . ${THESEUS_GIT_COMMIT} 10.2 ${THESEUS_VERSION}
-        pip install $(ls */*.whl)
-        pip install -r project/requirements/dev.txt
-
 build_cuda11_wheel: &build_cuda11_wheel
   - run:
       name: Building wheel for CUDA 11
@@ -290,26 +279,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
       - <<: *run_tests_from_wheel
 
 
@@ -323,5 +301,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