diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 4189154..575f52c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,36 +8,41 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_cuda_compiler_version12.9: - CONFIG: linux_64_cuda_compiler_version12.9 + linux_64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13: + CONFIG: linux_64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_64_cuda_compiler_version12.9 - linux_64_cuda_compiler_versionNone: - CONFIG: linux_64_cuda_compiler_versionNone + SHORT_CONFIG: linux_64_c_stdlib_version2.17cuda_compil_h344ab175 + linux_64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_64_cuda_compiler_versionNone - linux_aarch64_cuda_compiler_version12.9: - CONFIG: linux_aarch64_cuda_compiler_version12.9 + SHORT_CONFIG: linux_64_c_stdlib_version2.17cuda_compil_h525839bd + linux_64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14: + CONFIG: linux_64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_aarch64_cuda_compiler_version12.9 - linux_aarch64_cuda_compiler_versionNone: - CONFIG: linux_aarch64_cuda_compiler_versionNone + SHORT_CONFIG: linux_64_c_stdlib_version2.28cuda_compil_hb8a9452e + linux_aarch64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13: + CONFIG: linux_aarch64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_aarch64_cuda_compiler_versionNone - linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12: - CONFIG: linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12 + SHORT_CONFIG: linux_aarch64_c_stdlib_version2.17cuda_c_h3994f4c2 + linux_aarch64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14: + CONFIG: linux_aarch64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_ppc64le_cuda_compiler_version12.4c_h49511dc2 - linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14: - CONFIG: linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14 + SHORT_CONFIG: linux_aarch64_c_stdlib_version2.17cuda_c_h5ef48e87 + linux_aarch64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14: + CONFIG: linux_aarch64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - SHORT_CONFIG: linux_ppc64le_cuda_compiler_versionNonec_h7533b02e + SHORT_CONFIG: linux_aarch64_c_stdlib_version2.28cuda_c_hf57a065c + linux_ppc64le_: + CONFIG: linux_ppc64le_ + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 + SHORT_CONFIG: linux_ppc64le_ timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index b662508..bc92417 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-13 + vmImage: macOS-15 strategy: matrix: osx_64_: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 575076c..e121d7b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,10 +8,14 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_cuda_compiler_version12.9: - CONFIG: win_64_cuda_compiler_version12.9 + win_64_cuda_compiler_version12.6: + CONFIG: win_64_cuda_compiler_version12.6 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_cuda_compiler_version12.9 + SHORT_CONFIG: win_64_cuda_compiler_version12.6 + win_64_cuda_compiler_version13.0: + CONFIG: win_64_cuda_compiler_version13.0 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_cuda_compiler_version13.0 win_64_cuda_compiler_versionNone: CONFIG: win_64_cuda_compiler_versionNone UPLOAD_PACKAGES: 'True' diff --git a/.ci_support/linux_64_cuda_compiler_version12.9.yaml b/.ci_support/linux_64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13.yaml similarity index 91% rename from .ci_support/linux_64_cuda_compiler_version12.9.yaml rename to .ci_support/linux_64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13.yaml index 10be0bb..a2758d9 100644 --- a/.ci_support/linux_64_cuda_compiler_version12.9.yaml +++ b/.ci_support/linux_64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13.yaml @@ -11,11 +11,11 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.9' +- '12.6' cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '13' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: @@ -24,4 +24,5 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version - cuda_compiler_version diff --git a/.ci_support/linux_64_cuda_compiler_versionNone.yaml b/.ci_support/linux_64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 95% rename from .ci_support/linux_64_cuda_compiler_versionNone.yaml rename to .ci_support/linux_64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14.yaml index 5d48808..942f5e5 100644 --- a/.ci_support/linux_64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -24,4 +24,5 @@ target_platform: - linux-64 zip_keys: - - cxx_compiler_version + - c_stdlib_version - cuda_compiler_version diff --git a/.ci_support/linux_64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml b/.ci_support/linux_64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml new file mode 100644 index 0000000..3d08fe9 --- /dev/null +++ b/.ci_support/linux_64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml @@ -0,0 +1,28 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.28' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '13.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '14' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +libboost_devel: +- '1.88' +target_platform: +- linux-64 +zip_keys: +- - cxx_compiler_version + - c_stdlib_version + - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13.yaml similarity index 91% rename from .ci_support/linux_aarch64_cuda_compiler_version12.9.yaml rename to .ci_support/linux_aarch64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13.yaml index 881b674..a3236b1 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_version12.9.yaml +++ b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13.yaml @@ -11,11 +11,11 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.9' +- '12.6' cxx_compiler: - gxx cxx_compiler_version: -- '14' +- '13' docker_image: - quay.io/condaforge/linux-anvil-x86_64:alma9 libboost_devel: @@ -24,4 +24,5 @@ target_platform: - linux-aarch64 zip_keys: - - cxx_compiler_version + - c_stdlib_version - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14.yaml similarity index 95% rename from .ci_support/linux_aarch64_cuda_compiler_versionNone.yaml rename to .ci_support/linux_aarch64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14.yaml index 56eb507..1ec93af 100644 --- a/.ci_support/linux_aarch64_cuda_compiler_versionNone.yaml +++ b/.ci_support/linux_aarch64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14.yaml @@ -24,4 +24,5 @@ target_platform: - linux-aarch64 zip_keys: - - cxx_compiler_version + - c_stdlib_version - cuda_compiler_version diff --git a/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml b/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml new file mode 100644 index 0000000..10c0a40 --- /dev/null +++ b/.ci_support/linux_aarch64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14.yaml @@ -0,0 +1,28 @@ +c_stdlib: +- sysroot +c_stdlib_version: +- '2.28' +cdt_name: +- conda +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '13.0' +cxx_compiler: +- gxx +cxx_compiler_version: +- '14' +docker_image: +- quay.io/condaforge/linux-anvil-x86_64:alma9 +libboost_devel: +- '1.88' +target_platform: +- linux-aarch64 +zip_keys: +- - cxx_compiler_version + - c_stdlib_version + - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml b/.ci_support/linux_ppc64le_.yaml similarity index 93% rename from .ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml rename to .ci_support/linux_ppc64le_.yaml index 3289b96..cffce77 100644 --- a/.ci_support/linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -8,8 +8,6 @@ channel_sources: - conda-forge channel_targets: - conda-forge main -cuda_compiler: -- cuda-nvcc cuda_compiler_version: - None cxx_compiler: @@ -24,4 +22,5 @@ target_platform: - linux-ppc64le zip_keys: - - cxx_compiler_version + - c_stdlib_version - cuda_compiler_version diff --git a/.ci_support/linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml b/.ci_support/linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml deleted file mode 100644 index 6c87d15..0000000 --- a/.ci_support/linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12.yaml +++ /dev/null @@ -1,27 +0,0 @@ -c_stdlib: -- sysroot -c_stdlib_version: -- '2.17' -cdt_name: -- conda -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -cuda_compiler: -- cuda-nvcc -cuda_compiler_version: -- '12.4' -cxx_compiler: -- gxx -cxx_compiler_version: -- '12' -docker_image: -- quay.io/condaforge/linux-anvil-x86_64:alma9 -libboost_devel: -- '1.88' -target_platform: -- linux-ppc64le -zip_keys: -- - cxx_compiler_version - - cuda_compiler_version diff --git a/.ci_support/migrations/cuda129.yaml b/.ci_support/migrations/cuda130.yaml similarity index 72% rename from .ci_support/migrations/cuda129.yaml rename to .ci_support/migrations/cuda130.yaml index 6a49f06..6cdcbb1 100644 --- a/.ci_support/migrations/cuda129.yaml +++ b/.ci_support/migrations/cuda130.yaml @@ -1,11 +1,11 @@ -migrator_ts: 1738229377 +migrator_ts: 1755016036 __migrator: - kind: - version + use_local: true + operation: key_add migration_number: 1 build_number: - 1 + 0 paused: false override_cbc_keys: - cuda_compiler_stub @@ -18,31 +18,35 @@ __migrator: - 12.8 - None - 12.9 + - 13.0 # to allow manual opt-in for CUDA 11.8, see # https://github.com/conda-forge/conda-forge-pinning-feedstock/pull/7472 # must be last due to how cuda_compiler ordering in that migrator works - 11.8 + wait_for_migrators: + - cuda129 commit_message: | - Upgrade to CUDA 12.9 - - CUDA 12.8 added support for architectures `sm_100`, `sm_101` and `sm_120`, - while CUDA 12.9 further added `sm_103` and `sm_121`. To build for these, - maintainers will need to modify their existing list of specified architectures - (e.g. `CMAKE_CUDA_ARCHITECTURES`, `TORCH_CUDA_ARCH_LIST`, etc.) - for their package. A good balance between broad support and storage - footprint (resp. compilation time) is to add `sm_100` and `sm_120`. - + Upgrade to CUDA 13.0 + + CUDA 13.0 removed support for architectures before `sm_75`, and renamed `sm_101` to + `sm_110`. To build for these, maintainers will need to modify their existing list of + specified architectures (e.g. `CMAKE_CUDA_ARCHITECTURES`, `TORCH_CUDA_ARCH_LIST`, etc.) + for their package. + Since CUDA 12.8, the conda-forge nvcc package now sets `CUDAARCHS` and `TORCH_CUDA_ARCH_LIST` in its activation script to a string containing all of the supported real architectures plus the virtual architecture of the latest. Recipes for packages who use these variables to control their build but do not want to build for all supported architectures will need to override these variables in their build script. - + ref: https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#new-features cuda_compiler_version: # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - - 12.9 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 13.0 # [((linux and (x86_64 or aarch64)) or win64) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + +c_stdlib_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] + - 2.28 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] c_compiler_version: # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] - 14 # [(linux and (x86_64 or aarch64)) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"] diff --git a/.ci_support/win_64_cuda_compiler_version12.9.yaml b/.ci_support/win_64_cuda_compiler_version12.6.yaml similarity index 95% rename from .ci_support/win_64_cuda_compiler_version12.9.yaml rename to .ci_support/win_64_cuda_compiler_version12.6.yaml index 282d4fa..25476a9 100644 --- a/.ci_support/win_64_cuda_compiler_version12.9.yaml +++ b/.ci_support/win_64_cuda_compiler_version12.6.yaml @@ -7,7 +7,7 @@ channel_targets: cuda_compiler: - cuda-nvcc cuda_compiler_version: -- '12.9' +- '12.6' cxx_compiler: - vs2022 libboost_devel: diff --git a/.ci_support/win_64_cuda_compiler_version13.0.yaml b/.ci_support/win_64_cuda_compiler_version13.0.yaml new file mode 100644 index 0000000..1ac2de2 --- /dev/null +++ b/.ci_support/win_64_cuda_compiler_version13.0.yaml @@ -0,0 +1,16 @@ +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cuda_compiler: +- cuda-nvcc +cuda_compiler_version: +- '13.0' +cxx_compiler: +- vs2022 +libboost_devel: +- '1.88' +target_platform: +- win-64 diff --git a/README.md b/README.md index 49b7ed2..fecb501 100644 --- a/README.md +++ b/README.md @@ -27,45 +27,52 @@ Current build status - + - + - + - + - + - + + + + @@ -83,10 +90,17 @@ Current build status - + + + + diff --git a/recipe/bld.bat b/recipe/bld.bat index 5ec570e..ad68349 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -19,11 +19,12 @@ cmake^ -DCMAKE_INSTALL_PREFIX:PATH="%LIBRARY_PREFIX%"^ -DASTRA_USE_CUDA:BOOL=%ASTRA_USE_CUDA%^ %CMAKE_ARGS%^ + --log-level=DEBUG^ %SRC_DIR% if errorlevel 1 exit /b 1 -cmake --build . --config Release +cmake --build . --config Release --verbose if errorlevel 1 exit /b 1 -cmake --install . --strip +cmake --install . --strip --verbose if errorlevel 1 exit /b 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 33acc8c..ac4a8d8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -2,8 +2,6 @@ {% set commit = "c9402b770efcc2721e6c49dec8428542e59f7a17" %} # https://github.com/astra-toolbox/astra-toolbox/releases/tag/v2.3.1 {% set build_number = 1 %} -{% set cuda_major = environ.get("cuda_compiler_version", "11.2").split(".")[0]|int %} - package: name: libastra version: {{ version }} @@ -44,10 +42,8 @@ requirements: - cuda-version {{ cuda_compiler_version }} # [cuda_compiler_version != "None"] # Unit tests link to libboost_unit_test_framework.so - libboost-devel -{% if cuda_major == 12 %} - - cuda-cudart-dev - - libcufft-dev -{% endif %} + - cuda-cudart-dev # [cuda_compiler_version != "None"] + - libcufft-dev # [cuda_compiler_version != "None"] run: - __cuda # [cuda_compiler_version != "None"]
VariantStatus
linux_64_cuda_compiler_version12.9linux_64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13 - variant + variant
linux_64_cuda_compiler_versionNonelinux_64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14 - variant + variant
linux_aarch64_cuda_compiler_version12.9linux_64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14 - variant + variant
linux_aarch64_cuda_compiler_versionNonelinux_aarch64_c_stdlib_version2.17cuda_compiler_version12.6cxx_compiler_version13 - variant + variant
linux_ppc64le_cuda_compiler_version12.4cxx_compiler_version12linux_aarch64_c_stdlib_version2.17cuda_compiler_versionNonecxx_compiler_version14 - variant + variant
linux_ppc64le_cuda_compiler_versionNonecxx_compiler_version14linux_aarch64_c_stdlib_version2.28cuda_compiler_version13.0cxx_compiler_version14 - variant + variant + +
linux_ppc64le + + variant
win_64_cuda_compiler_version12.9win_64_cuda_compiler_version12.6 + + variant + +
win_64_cuda_compiler_version13.0 - variant + variant