Add CUDA 10.1 (#1478)

.circleci/config.yml

@@ -49,7 +49,7 @@ binary_common: &binary_common
     wheel_docker_image:
       description: "Wheel only: what docker image to use"
       type: string
-      default: "soumith/manylinux-cuda100"
+      default: "soumith/manylinux-cuda101"
   environment:
     PYTHON_VERSION: << parameters.python_version >>
     BUILD_VERSION: << parameters.build_version >>
@@ -297,11 +297,22 @@ workflows:
           cu_version: cu100
           name: binary_linux_wheel_py2.7_cu100
           python_version: '2.7'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_linux_wheel:
           cu_version: cu100
           name: binary_linux_wheel_py2.7u_cu100
           python_version: '2.7'
           unicode_abi: '1'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_wheel:
+          cu_version: cu101
+          name: binary_linux_wheel_py2.7_cu101
+          python_version: '2.7'
+      - binary_linux_wheel:
+          cu_version: cu101
+          name: binary_linux_wheel_py2.7u_cu101
+          python_version: '2.7'
+          unicode_abi: '1'
       - binary_linux_wheel:
           cu_version: cpu
           name: binary_linux_wheel_py3.5_cpu
@@ -315,6 +326,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_wheel_py3.5_cu100
           python_version: '3.5'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_wheel:
+          cu_version: cu101
+          name: binary_linux_wheel_py3.5_cu101
+          python_version: '3.5'
       - binary_linux_wheel:
           cu_version: cpu
           name: binary_linux_wheel_py3.6_cpu
@@ -328,6 +344,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_wheel_py3.6_cu100
           python_version: '3.6'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_wheel:
+          cu_version: cu101
+          name: binary_linux_wheel_py3.6_cu101
+          python_version: '3.6'
       - binary_linux_wheel:
           cu_version: cpu
           name: binary_linux_wheel_py3.7_cpu
@@ -341,6 +362,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_wheel_py3.7_cu100
           python_version: '3.7'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_wheel:
+          cu_version: cu101
+          name: binary_linux_wheel_py3.7_cu101
+          python_version: '3.7'
       - binary_macos_wheel:
           cu_version: cpu
           name: binary_macos_wheel_py2.7_cpu
@@ -375,6 +401,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_conda_py2.7_cu100
           python_version: '2.7'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_conda:
+          cu_version: cu101
+          name: binary_linux_conda_py2.7_cu101
+          python_version: '2.7'
       - binary_linux_conda:
           cu_version: cpu
           name: binary_linux_conda_py3.5_cpu
@@ -388,6 +419,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_conda_py3.5_cu100
           python_version: '3.5'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_conda:
+          cu_version: cu101
+          name: binary_linux_conda_py3.5_cu101
+          python_version: '3.5'
       - binary_linux_conda:
           cu_version: cpu
           name: binary_linux_conda_py3.6_cpu
@@ -401,6 +437,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_conda_py3.6_cu100
           python_version: '3.6'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_conda:
+          cu_version: cu101
+          name: binary_linux_conda_py3.6_cu101
+          python_version: '3.6'
       - binary_linux_conda:
           cu_version: cpu
           name: binary_linux_conda_py3.7_cpu
@@ -414,6 +455,11 @@ workflows:
           cu_version: cu100
           name: binary_linux_conda_py3.7_cu100
           python_version: '3.7'
+          wheel_docker_image: soumith/manylinux-cuda100
+      - binary_linux_conda:
+          cu_version: cu101
+          name: binary_linux_conda_py3.7_cu101
+          python_version: '3.7'
       - binary_macos_conda:
           cu_version: cpu
           name: binary_macos_conda_py2.7_cpu
@@ -517,6 +563,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_wheel_py2.7_cu100
           python_version: '2.7'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_wheel_upload:
           context: org-member
           filters:
@@ -534,6 +581,7 @@ workflows:
           name: nightly_binary_linux_wheel_py2.7u_cu100
           python_version: '2.7'
           unicode_abi: '1'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_wheel_upload:
           context: org-member
           filters:
@@ -543,6 +591,39 @@ workflows:
           requires:
           - nightly_binary_linux_wheel_py2.7u_cu100
           subfolder: cu100/
+      - binary_linux_wheel:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py2.7_cu101
+          python_version: '2.7'
+      - binary_wheel_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py2.7_cu101_upload
+          requires:
+          - nightly_binary_linux_wheel_py2.7_cu101
+          subfolder: cu101/
+      - binary_linux_wheel:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py2.7u_cu101
+          python_version: '2.7'
+          unicode_abi: '1'
+      - binary_wheel_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py2.7u_cu101_upload
+          requires:
+          - nightly_binary_linux_wheel_py2.7u_cu101
+          subfolder: cu101/
       - binary_linux_wheel:
           cu_version: cpu
           filters:
@@ -583,6 +664,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_wheel_py3.5_cu100
           python_version: '3.5'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_wheel_upload:
           context: org-member
           filters:
@@ -592,6 +674,22 @@ workflows:
           requires:
           - nightly_binary_linux_wheel_py3.5_cu100
           subfolder: cu100/
+      - binary_linux_wheel:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py3.5_cu101
+          python_version: '3.5'
+      - binary_wheel_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py3.5_cu101_upload
+          requires:
+          - nightly_binary_linux_wheel_py3.5_cu101
+          subfolder: cu101/
       - binary_linux_wheel:
           cu_version: cpu
           filters:
@@ -632,6 +730,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_wheel_py3.6_cu100
           python_version: '3.6'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_wheel_upload:
           context: org-member
           filters:
@@ -641,6 +740,22 @@ workflows:
           requires:
           - nightly_binary_linux_wheel_py3.6_cu100
           subfolder: cu100/
+      - binary_linux_wheel:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py3.6_cu101
+          python_version: '3.6'
+      - binary_wheel_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py3.6_cu101_upload
+          requires:
+          - nightly_binary_linux_wheel_py3.6_cu101
+          subfolder: cu101/
       - binary_linux_wheel:
           cu_version: cpu
           filters:
@@ -681,6 +796,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_wheel_py3.7_cu100
           python_version: '3.7'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_wheel_upload:
           context: org-member
           filters:
@@ -690,6 +806,22 @@ workflows:
           requires:
           - nightly_binary_linux_wheel_py3.7_cu100
           subfolder: cu100/
+      - binary_linux_wheel:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py3.7_cu101
+          python_version: '3.7'
+      - binary_wheel_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_wheel_py3.7_cu101_upload
+          requires:
+          - nightly_binary_linux_wheel_py3.7_cu101
+          subfolder: cu101/
       - binary_macos_wheel:
           cu_version: cpu
           filters:
@@ -809,6 +941,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_conda_py2.7_cu100
           python_version: '2.7'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_conda_upload:
           context: org-member
           filters:
@@ -817,6 +950,21 @@ workflows:
           name: nightly_binary_linux_conda_py2.7_cu100_upload
           requires:
           - nightly_binary_linux_conda_py2.7_cu100
+      - binary_linux_conda:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py2.7_cu101
+          python_version: '2.7'
+      - binary_conda_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py2.7_cu101_upload
+          requires:
+          - nightly_binary_linux_conda_py2.7_cu101
       - binary_linux_conda:
           cu_version: cpu
           filters:
@@ -855,6 +1003,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_conda_py3.5_cu100
           python_version: '3.5'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_conda_upload:
           context: org-member
           filters:
@@ -863,6 +1012,21 @@ workflows:
           name: nightly_binary_linux_conda_py3.5_cu100_upload
           requires:
           - nightly_binary_linux_conda_py3.5_cu100
+      - binary_linux_conda:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py3.5_cu101
+          python_version: '3.5'
+      - binary_conda_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py3.5_cu101_upload
+          requires:
+          - nightly_binary_linux_conda_py3.5_cu101
       - binary_linux_conda:
           cu_version: cpu
           filters:
@@ -901,6 +1065,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_conda_py3.6_cu100
           python_version: '3.6'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_conda_upload:
           context: org-member
           filters:
@@ -909,6 +1074,21 @@ workflows:
           name: nightly_binary_linux_conda_py3.6_cu100_upload
           requires:
           - nightly_binary_linux_conda_py3.6_cu100
+      - binary_linux_conda:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py3.6_cu101
+          python_version: '3.6'
+      - binary_conda_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py3.6_cu101_upload
+          requires:
+          - nightly_binary_linux_conda_py3.6_cu101
       - binary_linux_conda:
           cu_version: cpu
           filters:
@@ -947,6 +1127,7 @@ workflows:
               only: nightly
           name: nightly_binary_linux_conda_py3.7_cu100
           python_version: '3.7'
+          wheel_docker_image: soumith/manylinux-cuda100
       - binary_conda_upload:
           context: org-member
           filters:
@@ -955,6 +1136,21 @@ workflows:
           name: nightly_binary_linux_conda_py3.7_cu100_upload
           requires:
           - nightly_binary_linux_conda_py3.7_cu100
+      - binary_linux_conda:
+          cu_version: cu101
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py3.7_cu101
+          python_version: '3.7'
+      - binary_conda_upload:
+          context: org-member
+          filters:
+            branches:
+              only: nightly
+          name: nightly_binary_linux_conda_py3.7_cu101_upload
+          requires:
+          - nightly_binary_linux_conda_py3.7_cu101
       - binary_macos_conda:
           cu_version: cpu
           filters:

.circleci/config.yml.in

@@ -49,7 +49,7 @@ binary_common: &binary_common
     wheel_docker_image:
       description: "Wheel only: what docker image to use"
       type: string
-      default: "soumith/manylinux-cuda100"
+      default: "soumith/manylinux-cuda101"
   environment:
     PYTHON_VERSION: << parameters.python_version >>
     BUILD_VERSION: << parameters.build_version >>

.circleci/regenerate.py

@@ -24,7 +24,7 @@ def workflows(prefix='', filter_branch=None, upload=False, indentation=6):
     for btype in ["wheel", "conda"]:
         for os_type in ["linux", "macos"]:
             for python_version in ["2.7", "3.5", "3.6", "3.7"]:
-                for cu_version in (["cpu", "cu92", "cu100"] if os_type == "linux" else ["cpu"]):
+                for cu_version in (["cpu", "cu92", "cu100", "cu101"] if os_type == "linux" else ["cpu"]):
                     for unicode in ([False, True] if btype == "wheel" and python_version == "2.7" else [False]):
                         w += workflow_pair(
                             btype, os_type, python_version, cu_version,
@@ -63,6 +63,8 @@ def generate_base_workflow(base_workflow_name, python_version, cu_version,
 
     if cu_version == "cu92":
         d["wheel_docker_image"] = "soumith/manylinux-cuda92"
+    elif cu_version == "cu100":
+        d["wheel_docker_image"] = "soumith/manylinux-cuda100"
 
     if filter_branch is not None:
         d["filters"] = {"branches": {"only": filter_branch}}

packaging/pkg_helpers.bash

@@ -36,7 +36,7 @@ setup_cuda() {
   # Wheel builds need suffixes (but not if they're on OS X, which never has suffix)
   if [[ "$BUILD_TYPE" == "wheel" ]] && [[ "$(uname)" != Darwin ]]; then
     # The default CUDA has no suffix
-    if [[ "$CU_VERSION" != "cu100" ]]; then
+    if [[ "$CU_VERSION" != "cu101" ]]; then
       export PYTORCH_VERSION_SUFFIX="+$CU_VERSION"
     fi
     # Match the suffix scheme of pytorch, unless this package does not have
@@ -49,6 +49,13 @@ setup_cuda() {
 
   # Now work out the CUDA settings
   case "$CU_VERSION" in
+    cu101)
+      export CUDA_HOME=/usr/local/cuda-10.1/
+      export FORCE_CUDA=1
+      # Hard-coding gencode flags is temporary situation until
+      # https://github.com/pytorch/pytorch/pull/23408 lands
+      export NVCC_FLAGS="-gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75 -gencode=arch=compute_50,code=compute_50"
+      ;;
     cu100)
       export CUDA_HOME=/usr/local/cuda-10.0/
       export FORCE_CUDA=1
@@ -209,6 +216,9 @@ setup_conda_cudatoolkit_constraint() {
     export CONDA_CUDATOOLKIT_CONSTRAINT=""
   else
     case "$CU_VERSION" in
+      cu101)
+        export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=10.1,<10.2 # [not osx]"
+        ;;
       cu100)
         export CONDA_CUDATOOLKIT_CONSTRAINT="- cudatoolkit >=10.0,<10.1 # [not osx]"
         ;;

packaging/wheel/linux_manywheel.sh

@@ -8,7 +8,7 @@ if [ "$#" -ne 1 ]; then
 fi
 export CUVER="$1" # cu92 cu100 cpu
 
-if [[ "$CUVER" == "cu100" ]]; then
+if [[ "$CUVER" == "cu101" ]]; then
   cu_suffix=""
 else
   cu_suffix="+$CUVER"