diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f998f864..aab08cd9 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -208,7 +208,7 @@ jobs: : CONFIG: linux_aarch64_c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12numpy2.0python3.9.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - maxParallel: 31 + maxParallel: 25 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index eafeafb0..c137b73f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -68,7 +68,7 @@ jobs: osx_arm64_numpy2.0python3.9.____cpythonsuffix-novec: CONFIG: osx_arm64_numpy2.0python3.9.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' - maxParallel: 12 + maxParallel: 10 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 1b1f0099..4176005b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -38,10 +38,70 @@ jobs: win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix-novec: CONFIG: win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix-novec UPLOAD_PACKAGES: 'True' - maxParallel: 6 + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix + UPLOAD_PACKAGES: 'True' + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix-novec: + CONFIG: win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix-novec + UPLOAD_PACKAGES: 'True' + maxParallel: 15 timeoutInMinutes: 360 variables: - CONDA_BLD_PATH: D:\\bld\\ + CONDA_BLD_PATH: C:\bld\ SET_PAGEFILE: 'True' UPLOAD_TEMP: D:\\tmp diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix-novec.yaml index 6c938d3e..cf0322c2 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix-novec.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix-novec.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix.yaml index 8fb69f78..09cd6390 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy1.22python3.8.____cpythonsuffix.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix-novec.yaml index eeafdbbc..af736e1f 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix-novec.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix-novec.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix.yaml index 25ffc3be..d7fe98b6 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.10.____cpythonsuffix.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix-novec.yaml index e5b291b3..b587523b 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix-novec.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix-novec.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix.yaml index 971cb13a..b8e282e3 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.11.____cpythonsuffix.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix-novec.yaml index 331ad404..8550755b 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix-novec.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix-novec.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix.yaml index ccfbb9f4..8425f10d 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.12.____cpythonsuffix.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix-novec.yaml index 39fa71aa..ba94ca9c 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix-novec.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix-novec.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix.yaml index 167b4082..a62009fc 100644 --- a/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix.yaml +++ b/.ci_support/win_64_cuda_compilerNonecuda_compiler_versionNonenumpy2.0python3.9.____cpythonsuffix.yaml @@ -10,6 +10,8 @@ cuda_compiler: - None cuda_compiler_version: - None +cudnn: +- '8' cxx_compiler: - vs2022 numpy: diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..aa5601ef --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix.yaml new file mode 100644 index 00000000..e5c18f07 --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..786d9944 --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix.yaml new file mode 100644 index 00000000..cb7afd3f --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..541dd50a --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix.yaml new file mode 100644 index 00000000..ac9220fc --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..2391dc56 --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix.yaml new file mode 100644 index 00000000..ccf413d2 --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..72264472 --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix.yaml new file mode 100644 index 00000000..0df0a5c7 --- /dev/null +++ b/.ci_support/win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '12.0' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..186e2e8a --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix.yaml new file mode 100644 index 00000000..caae4da6 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '1.22' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.8.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..3e746824 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix.yaml new file mode 100644 index 00000000..d69fecf8 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..d7a21b94 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix.yaml new file mode 100644 index 00000000..38e72699 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.11.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..2aff6fcd --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix.yaml new file mode 100644 index 00000000..1a8903f2 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.12.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix-novec.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix-novec.yaml new file mode 100644 index 00000000..7edc60b7 --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix-novec.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +suffix: +- -novec +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix.yaml b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix.yaml new file mode 100644 index 00000000..9280d30d --- /dev/null +++ b/.ci_support/win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix.yaml @@ -0,0 +1,35 @@ +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge/label/numpy_rc,conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- nvcc +cuda_compiler_version: +- '11.8' +cudnn: +- '8' +cxx_compiler: +- vs2022 +numpy: +- '2.0' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.9.* *_cpython +suffix: +- '' +target_platform: +- win-64 +zip_keys: +- - cuda_compiler + - cuda_compiler_version +- - python + - numpy +zlib: +- '1.2' diff --git a/README.md b/README.md index 3e25a20c..02d86422 100644 --- a/README.md +++ b/README.md @@ -608,6 +608,146 @@ Current build status variant + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy1.22python3.8.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.10.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.11.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.12.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix + + + variant + + + + win_64_cuda_compilercuda-nvcccuda_compiler_version12.0numpy2.0python3.9.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy1.22python3.8.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.10.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.11.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.12.____cpythonsuffix-novec + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix + + + variant + + + + win_64_cuda_compilernvcccuda_compiler_version11.8numpy2.0python3.9.____cpythonsuffix-novec + + + variant + + diff --git a/conda-forge.yml b/conda-forge.yml index f7767fea..75ab74e2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -5,6 +5,7 @@ azure: settings_win: variables: SET_PAGEFILE: 'True' + CONDA_BLD_PATH: C:\bld\ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 diff --git a/recipe/bld.bat b/recipe/bld.bat index 8590d519..df104bc4 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -3,8 +3,10 @@ :: Enable CUDA support if "%cuda_compiler_version%"=="None" ( set "BUILD_ARGS=" + set onnxruntime_BUILD_UNIT_TESTS=ON ) else ( - set "BUILD_ARGS=--use_cuda --cudnn_home %PREFIX%\Library" + set "BUILD_ARGS=--use_cuda --cuda_home %LIBRARY_PREFIX% --cudnn_home %LIBRARY_PREFIX%" + set onnxruntime_BUILD_UNIT_TESTS=OFF ) :: We set CMAKE_DISABLE_FIND_PACKAGE_Protobuf=ON as currently we do not want to use @@ -12,7 +14,7 @@ if "%cuda_compiler_version%"=="None" ( python tools/ci_build/build.py ^ --compile_no_warning_as_error ^ --build_dir build-ci ^ - --cmake_extra_defines EIGEN_MPL2_ONLY=ON "onnxruntime_USE_COREML=OFF" "onnxruntime_BUILD_SHARED_LIB=ON" "onnxruntime_BUILD_UNIT_TESTS=ON" CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% CMAKE_DISABLE_FIND_PACKAGE_Protobuf=ON CMAKE_CUDA_ARCHITECTURES=all ^ + --cmake_extra_defines EIGEN_MPL2_ONLY=ON "onnxruntime_USE_COREML=OFF" "onnxruntime_BUILD_SHARED_LIB=ON" "onnxruntime_BUILD_UNIT_TESTS=%onnxruntime_BUILD_UNIT_TESTS%" CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% CMAKE_DISABLE_FIND_PACKAGE_Protobuf=ON CMAKE_CUDA_ARCHITECTURES=all-major ^ --cmake_generator Ninja ^ --build_wheel ^ --config Release ^ diff --git a/recipe/do_not_pass_msvc_style_definitions_to_nvcc.patch b/recipe/do_not_pass_msvc_style_definitions_to_nvcc.patch new file mode 100644 index 00000000..5e99cfcf --- /dev/null +++ b/recipe/do_not_pass_msvc_style_definitions_to_nvcc.patch @@ -0,0 +1,13 @@ +diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py +index 85583e1..22b91fa 100644 +--- a/tools/ci_build/build.py ++++ b/tools/ci_build/build.py +@@ -1525,7 +1525,7 @@ def generate_build_tree( + cuda_compile_flags_str = "" + for compile_flag in cflags: + if compile_flag.startswith("/D"): +- cudaflags.append(compile_flag) ++ cudaflags.append(compile_flag.replace("/D","-D")) + else: + cuda_compile_flags_str = cuda_compile_flags_str + " " + compile_flag + if len(cuda_compile_flags_str) != 0: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 291749c8..3ceb4d66 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -4,7 +4,7 @@ {% set build_ext = "cuda" if cuda_enabled else "cpu" %} {% set version = "1.18.0" %} {% set suffix = "" %} # [suffix == None] -{% set build = 1 %} +{% set build = 2 %} {% if cuda_enabled %} {% set build = build + 200 %} @@ -28,14 +28,15 @@ source: # Workaround for https://github.com/conda-forge/onnxruntime-feedstock/pull/56#issuecomment-1586080419 - windows_workaround_conflict_onnxruntime_dll_system32.patch # [win] - cxx_17_for_darwin.patch + # Workaround for https://github.com/conda-forge/onnxruntime-feedstock/pull/115#issuecomment-2122077816 + - do_not_pass_msvc_style_definitions_to_nvcc.patch # [win] + - remove_numpy_version.patch build: number: {{ build }} # Since 1.11, power9 seems to be required. skip: true # [ppc64le] - # CUDA compilation for Windows goes out-of-memory. - skip: true # [win and cuda_compiler_version in ("11.2", "11.8", "12.0")] skip: true # [linux and aarch64 and cuda_compiler_version == "12.0"] skip: true # [cuda_compiler_version == "11.2"] string: py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }} @@ -105,6 +106,11 @@ test: - onnxruntime_test --help requires: - pip + # 2024/05 hmaarrfk/jtilly + # Test the pip check command with numpy < 2 + # which was included in the requirements file for + # build time compatibility + - numpy 1.26.* # [py == 312] outputs: - name: {{ name|lower }}{{ suffix }} diff --git a/recipe/remove_numpy_version.patch b/recipe/remove_numpy_version.patch new file mode 100644 index 00000000..8adef4ec --- /dev/null +++ b/recipe/remove_numpy_version.patch @@ -0,0 +1,12 @@ +diff --git a/requirements.txt.in b/requirements.txt.in +index 89242061fb..a9c1327b8f 100644 +--- a/requirements.txt.in ++++ b/requirements.txt.in +@@ -1,6 +1,6 @@ + coloredlogs + flatbuffers +-numpy >= @Python_NumPy_VERSION@ ++numpy + packaging + protobuf + sympy