diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index aece617a..d4cf096d 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -52,7 +52,7 @@ jobs: CONFIG: linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - timeoutInMinutes: 1 + timeoutInMinutes: 360 variables: {} steps: diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index 90ef6d68..918efa6b 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index d43246be..a9cf557f 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml index c8dd370e..481f808e 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implgenericc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_blas_implgenericc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index ddde6c4e..a55ea260 100644 --- a/.ci_support/linux_64_blas_implgenericc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_blas_implgenericc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml index b2973378..a4949494 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version11c_stdlib_version2.17cuda_compilernvcccuda_compiler_version11.8cxx_compiler_version11.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index 39c95fde..d42cc485 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.17cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml index 1830a428..bd64f232 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_64_blas_implmklc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_64_blas_implmklc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index dd2b67bc..0cb2e6fb 100644 --- a/.ci_support/linux_64_blas_implmklc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_64_blas_implmklc_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -68,7 +68,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml index f6068d73..19d043ab 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.0cxx_compiler_version12.yaml @@ -15,7 +15,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml b/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml index ef375f13..19e1d772 100644 --- a/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version12c_stdlib_version2.28cuda_compilercuda-nvcccuda_compiler_version12.6cxx_compiler_version12.yaml @@ -15,7 +15,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml b/.ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml index 8ea2c64a..918fb39c 100644 --- a/.ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml +++ b/.ci_support/linux_aarch64_c_compiler_version13c_stdlib_version2.17cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version13.yaml @@ -15,7 +15,7 @@ cdt_arch: cdt_name: - cos7 channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: @@ -72,7 +72,6 @@ zip_keys: - - c_compiler_version - cxx_compiler_version - c_stdlib_version - - cdt_name - cuda_compiler - cuda_compiler_version - docker_image diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml index 55c58c9d..228b81c7 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.10.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml index 68eaf084..acb6aee1 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.11.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml index 07e46a1d..a8182654 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.12.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml index 3da1966b..8ab99e7e 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2.0python3.9.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml index 25dd3535..fbcdb202 100644 --- a/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implgenericnumpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml index a2e78e75..ee768015 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.10.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml index 07abde6f..3c3fa92f 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.11.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml index f127aa99..f2ab9b9c 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.12.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml index 32e683fb..b689e27d 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2.0python3.9.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml b/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml index 6598a6c2..3d2385cd 100644 --- a/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_64_blas_implmklnumpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '10.15' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml index c3e86dd0..97f26287 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.10.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml index 18f0a8f7..7a1558a5 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.11.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml index 053b6cad..648950c1 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.12.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml index df480878..88bb5503 100644 --- a/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_numpy2.0python3.9.____cpython.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml index f56cba66..eab269b0 100644 --- a/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml +++ b/.ci_support/osx_arm64_numpy2python3.13.____cp313.yaml @@ -13,7 +13,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge +- https://mgorny.github.io/conda-channel/mgorny,conda-forge channel_targets: - conda-forge main cuda_compiler: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 3015724d..a47a13a1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jeongseok-meta @Tobias-Fischer @beckermr @benjaminrwilson @hmaarrfk @sodre \ No newline at end of file +* @Tobias-Fischer @beckermr @benjaminrwilson @hmaarrfk @jeongseok-meta @sodre \ No newline at end of file diff --git a/README.md b/README.md index dfd99f5f..a99e2407 100644 --- a/README.md +++ b/README.md @@ -346,5 +346,6 @@ Feedstock Maintainers * [@beckermr](https://github.com/beckermr/) * [@benjaminrwilson](https://github.com/benjaminrwilson/) * [@hmaarrfk](https://github.com/hmaarrfk/) +* [@jeongseok-meta](https://github.com/jeongseok-meta/) * [@sodre](https://github.com/sodre/) diff --git a/conda-forge.yml b/conda-forge.yml index d21ee21a..e5568ddd 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,7 @@ azure: free_disk_space: true - settings_linux: - timeoutInMinutes: 1 +# settings_linux: +# timeoutInMinutes: 1 build_platform: linux_aarch64: linux_64 osx_arm64: osx_64 diff --git a/recipe/bld.bat b/recipe/bld.bat index c1c2b2e6..a5796900 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -44,6 +44,7 @@ set "CMAKE_GENERATOR_PLATFORM=" set "CMAKE_PREFIX_PATH=%LIBRARY_PREFIX%" set "libuv_ROOT=%LIBRARY_PREFIX%" set "USE_SYSTEM_SLEEF=OFF" +set "USE_SYSTEM_MKLDNN=ON" set "BUILD_CUSTOM_PROTOBUF=OFF" %PYTHON% -m pip install . --no-deps -vv diff --git a/recipe/build.sh b/recipe/build.sh index f36cd2bb..2aa742a6 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -68,6 +68,7 @@ export INSTALL_TEST=0 export BUILD_TEST=0 export USE_SYSTEM_SLEEF=1 +export USE_SYSTEM_MKLDNN=1 # use our protobuf export BUILD_CUSTOM_PROTOBUF=OFF rm -rf $PREFIX/bin/protoc diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index bbdadf2c..84f28a7f 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -103,3 +103,6 @@ github_actions_labels: # [linux] megabuild: - true # [linux] - false # [osx] + +channel_sources: +- https://mgorny.github.io/conda-channel/mgorny,conda-forge diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4b2b655d..fbcac3cd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set version = "2.5.1" %} -{% set build = 3 %} +{% set build = 4 %} {% if cuda_compiler_version != "None" %} {% set build = build + 200 %} @@ -36,6 +36,7 @@ source: - patches/0008-Fix-pickler-error.patch # https://github.com/pytorch/pytorch/pull/137331 - patches/137331.patch + - patches/0009-Use-system-mkldnn.patch build: number: {{ build }} @@ -138,6 +139,7 @@ requirements: - llvm-openmp # [osx] - libabseil - libprotobuf + - onednn 3.5.3 omp_experimental_* # [cuda_compiler_version == "None" and target_platform != "osx-arm64"] - sleef - typing - libuv @@ -261,6 +263,7 @@ outputs: - llvm-openmp # [osx] - libabseil - libprotobuf + - onednn 3.5.3 omp_experimental_* # [cuda_compiler_version == "None" and target_platform != "osx-arm64"] - sleef - typing - libuv diff --git a/recipe/patches/0009-Use-system-mkldnn.patch b/recipe/patches/0009-Use-system-mkldnn.patch new file mode 100644 index 00000000..f43d4707 --- /dev/null +++ b/recipe/patches/0009-Use-system-mkldnn.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98593c2d..94a9d63d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -470,6 +470,7 @@ option(USE_SYSTEM_FXDIV "Use system-provided fxdiv." OFF) + option(USE_SYSTEM_BENCHMARK "Use system-provided google benchmark." OFF) + option(USE_SYSTEM_ONNX "Use system-provided onnx." OFF) + option(USE_SYSTEM_XNNPACK "Use system-provided xnnpack." OFF) ++option(USE_SYSTEM_MKLDNN "Use system-provided mkl-dnn (oneAPI)." OFF) + option(USE_GOLD_LINKER "Use ld.gold to link" OFF) + if(USE_SYSTEM_LIBS) + set(USE_SYSTEM_CPUINFO ON) +@@ -488,6 +489,7 @@ if(USE_SYSTEM_LIBS) + if(USE_NCCL) + set(USE_SYSTEM_NCCL ON) + endif() ++ set(USE_SYSTEM_MKLDNN ON) + endif() + + # /Z7 override option When generating debug symbols, CMake default to use the +diff --git a/cmake/Modules/FindMKLDNN.cmake b/cmake/Modules/FindMKLDNN.cmake +index 234d361d..5614f071 100644 +--- a/cmake/Modules/FindMKLDNN.cmake ++++ b/cmake/Modules/FindMKLDNN.cmake +@@ -18,6 +18,18 @@ IF(NOT MKLDNN_FOUND) + + SET(IDEEP_ROOT "${PROJECT_SOURCE_DIR}/third_party/ideep") + SET(MKLDNN_ROOT "${PROJECT_SOURCE_DIR}/third_party/ideep/mkl-dnn") ++ FIND_PATH(IDEEP_INCLUDE_DIR ideep.hpp PATHS ${IDEEP_ROOT} PATH_SUFFIXES include) ++ ++ if(USE_SYSTEM_MKLDNN) ++ FIND_PACKAGE(DNNL REQUIRED) ++ LIST(APPEND MKLDNN_LIBRARIES DNNL::dnnl) ++ LIST(APPEND MKLDNN_INCLUDE_DIR ${IDEEP_INCLUDE_DIR}) ++ SET(MKLDNN_FOUND TRUE) ++ # TODO: do we actually need it, or just https://github.com/oneapi-src/oneDNN/pull/2211? ++ ADD_DEFINITIONS(-DDNNL_EXPERIMENTAL_UKERNEL) ++ MESSAGE(STATUS "Found MKL-DNN: SYSTEM") ++ RETURN() ++ endif() + + if(USE_XPU) # Build oneDNN GPU library + if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") +@@ -93,7 +105,6 @@ IF(NOT MKLDNN_FOUND) + ENDIF(EXISTS "${MKLDNN_ROOT}/include/oneapi/dnnl/dnnl_ukernel.hpp") + + FIND_PACKAGE(BLAS) +- FIND_PATH(IDEEP_INCLUDE_DIR ideep.hpp PATHS ${IDEEP_ROOT} PATH_SUFFIXES include) + FIND_PATH(MKLDNN_INCLUDE_DIR dnnl.hpp dnnl.h dnnl_ukernel.hpp dnnl_ukernel.h PATHS ${MKLDNN_ROOT} PATH_SUFFIXES include/oneapi/dnnl) + IF(NOT MKLDNN_INCLUDE_DIR) + MESSAGE("MKLDNN_INCLUDE_DIR not found")