Fix windows cuda 9.2 builds (#91)

Summary: Pull Request resolved: #91

Test Plan: Imported from OSS

Reviewed By: zou3519

Differential Revision: D25386316

Pulled By: pbelevich

fbshipit-source-id: e79f6e88ceff6a550c9b2b17fcbefe56d2e080ee

Author: pbelevich

.circleci/config.yml

@@ -497,15 +497,6 @@ workflows:
               only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
           name: binary_win_wheel_py3.6_cpu
           python_version: '3.6'
-      - binary_win_wheel:
-          cu_version: cu92
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: binary_win_wheel_py3.6_cu92
-          python_version: '3.6'
       - binary_win_wheel:
           cu_version: cu101
           filters:
@@ -542,15 +533,6 @@ workflows:
               only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
           name: binary_win_wheel_py3.7_cpu
           python_version: '3.7'
-      - binary_win_wheel:
-          cu_version: cu92
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: binary_win_wheel_py3.7_cu92
-          python_version: '3.7'
       - binary_win_wheel:
           cu_version: cu101
           filters:
@@ -582,15 +564,6 @@ workflows:
           cu_version: cpu
           name: binary_win_wheel_py3.8_cpu
           python_version: '3.8'
-      - binary_win_wheel:
-          cu_version: cu92
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: binary_win_wheel_py3.8_cu92
-          python_version: '3.8'
       - binary_win_wheel:
           cu_version: cu101
           filters:
@@ -712,15 +685,6 @@ workflows:
               only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
           name: binary_win_conda_py3.6_cpu
           python_version: '3.6'
-      - binary_win_conda:
-          cu_version: cu92
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: binary_win_conda_py3.6_cu92
-          python_version: '3.6'
       - binary_win_conda:
           cu_version: cu101
           filters:
@@ -757,15 +721,6 @@ workflows:
               only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
           name: binary_win_conda_py3.7_cpu
           python_version: '3.7'
-      - binary_win_conda:
-          cu_version: cu92
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: binary_win_conda_py3.7_cu92
-          python_version: '3.7'
       - binary_win_conda:
           cu_version: cu101
           filters:
@@ -797,15 +752,6 @@ workflows:
           cu_version: cpu
           name: binary_win_conda_py3.8_cpu
           python_version: '3.8'
-      - binary_win_conda:
-          cu_version: cu92
-          filters:
-            branches:
-              only: master
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: binary_win_conda_py3.8_cu92
-          python_version: '3.8'
       - binary_win_conda:
           cu_version: cu101
           filters:
@@ -1306,26 +1252,6 @@ workflows:
           requires:
             - nightly_binary_win_wheel_py3.6_cpu
           subfolder: cpu/
-      - binary_win_wheel:
-          cu_version: cu92
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_wheel_py3.6_cu92
-          python_version: '3.6'
-      - binary_wheel_upload:
-          context: org-member
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_wheel_py3.6_cu92_upload
-          requires:
-            - nightly_binary_win_wheel_py3.6_cu92
-          subfolder: cu92/
       - binary_win_wheel:
           cu_version: cu101
           filters:
@@ -1406,26 +1332,6 @@ workflows:
           requires:
             - nightly_binary_win_wheel_py3.7_cpu
           subfolder: cpu/
-      - binary_win_wheel:
-          cu_version: cu92
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_wheel_py3.7_cu92
-          python_version: '3.7'
-      - binary_wheel_upload:
-          context: org-member
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_wheel_py3.7_cu92_upload
-          requires:
-            - nightly_binary_win_wheel_py3.7_cu92
-          subfolder: cu92/
       - binary_win_wheel:
           cu_version: cu101
           filters:
@@ -1506,26 +1412,6 @@ workflows:
           requires:
             - nightly_binary_win_wheel_py3.8_cpu
           subfolder: cpu/
-      - binary_win_wheel:
-          cu_version: cu92
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_wheel_py3.8_cu92
-          python_version: '3.8'
-      - binary_wheel_upload:
-          context: org-member
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_wheel_py3.8_cu92_upload
-          requires:
-            - nightly_binary_win_wheel_py3.8_cu92
-          subfolder: cu92/
       - binary_win_wheel:
           cu_version: cu101
           filters:
@@ -1965,25 +1851,6 @@ workflows:
           name: nightly_binary_win_conda_py3.6_cpu_upload
           requires:
             - nightly_binary_win_conda_py3.6_cpu
-      - binary_win_conda:
-          cu_version: cu92
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_conda_py3.6_cu92
-          python_version: '3.6'
-      - binary_conda_upload:
-          context: org-member
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_conda_py3.6_cu92_upload
-          requires:
-            - nightly_binary_win_conda_py3.6_cu92
       - binary_win_conda:
           cu_version: cu101
           filters:
@@ -2060,25 +1927,6 @@ workflows:
           name: nightly_binary_win_conda_py3.7_cpu_upload
           requires:
             - nightly_binary_win_conda_py3.7_cpu
-      - binary_win_conda:
-          cu_version: cu92
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_conda_py3.7_cu92
-          python_version: '3.7'
-      - binary_conda_upload:
-          context: org-member
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_conda_py3.7_cu92_upload
-          requires:
-            - nightly_binary_win_conda_py3.7_cu92
       - binary_win_conda:
           cu_version: cu101
           filters:
@@ -2155,25 +2003,6 @@ workflows:
           name: nightly_binary_win_conda_py3.8_cpu_upload
           requires:
             - nightly_binary_win_conda_py3.8_cpu
-      - binary_win_conda:
-          cu_version: cu92
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_conda_py3.8_cu92
-          python_version: '3.8'
-      - binary_conda_upload:
-          context: org-member
-          filters:
-            branches:
-              only: nightly
-            tags:
-              only: /v[0-9]+(\.[0-9]+)*-rc[0-9]+/
-          name: nightly_binary_win_conda_py3.8_cu92_upload
-          requires:
-            - nightly_binary_win_conda_py3.8_cu92
       - binary_win_conda:
           cu_version: cu101
           filters:

packaging/build_wheel.sh

@@ -11,8 +11,44 @@ pip_install numpy pyyaml future ninja
 setup_pip_pytorch_version
 python setup.py clean
 
+# Copy binaries to be included in the wheel distribution
+if [[ "$(uname)" == Darwin || "$OSTYPE" == "msys" ]]; then
+    python_exec="$(which python)"
+    bin_path=$(dirname $python_exec)
+    env_path=$(dirname $bin_path)
+    if [[ "$(uname)" == Darwin ]]; then
+        # Install delocate to relocate the required binaries
+        pip_install delocate
+    fi
+else
+    # Install auditwheel to get some inspection utilities
+    pip_install auditwheel
+
+    # Point to custom libraries
+    export LD_LIBRARY_PATH=$(pwd)/ext_libraries/lib:$LD_LIBRARY_PATH
+    export TORCHCSPRNG_INCLUDE=$(pwd)/ext_libraries/include
+    export TORCHCSPRNG_LIBRARY=$(pwd)/ext_libraries/lib
+fi
+
 if [[ "$OSTYPE" == "msys" ]]; then
     IS_WHEEL=1 "$script_dir/windows/internal/vc_env_helper.bat" python setup.py bdist_wheel
 else
     IS_WHEEL=1 python setup.py bdist_wheel
 fi
+
+
+if [[ "$(uname)" == Darwin ]]; then
+    pushd dist/
+    python_exec="$(which python)"
+    bin_path=$(dirname $python_exec)
+    env_path=$(dirname $bin_path)
+    for whl in *.whl; do
+        DYLD_LIBRARY_PATH="$env_path/lib/:$DYLD_LIBRARY_PATH" delocate-wheel -v $whl
+    done
+else
+    if [[ "$OSTYPE" == "msys" ]]; then
+        "$script_dir/windows/internal/vc_env_helper.bat" python $script_dir/wheel/relocate.py
+    else
+        LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" python $script_dir/wheel/relocate.py
+    fi
+fi

packaging/conda/build_csprng.sh

@@ -127,7 +127,7 @@ else
 fi
 
 if [[ -z "$PYTORCH_VERSION" ]]; then
-    export CONDA_CHANNEL_FLAGS="-c pytorch-nightly"
+    export CONDA_CHANNEL_FLAGS="-c pytorch-nightly -c pytorch"
     export PYTORCH_VERSION="$(conda search --json 'pytorch[channel=pytorch-nightly]' | \
                                 python -c "import os, sys, json, re; cuver = '$cuver'; \
                                 cuver = cuver.replace('cu', 'cuda') if cuver != 'cpu' else cuver; \
@@ -164,9 +164,9 @@ for py_ver in "${DESIRED_PYTHON[@]}"; do
     mkdir "$output_folder"
 
     if [[ "$py_ver" == 3.5 ]]; then
-	export CONDA_TYPING_CONSTRAINT="- typing"
+      export CONDA_TYPING_CONSTRAINT="- typing"
     else
-	export CONDA_TYPING_CONSTRAINT=""
+      export CONDA_TYPING_CONSTRAINT=""
     fi
 
     export VSTOOLCHAIN_PACKAGE=vs2017