diff --git a/.gitignore b/.gitignore index 179afe5..7e7e48d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ # Ignore all files and folders in root * !/conda-forge.yml +!/abs.yaml # Don't ignore any files/folders if the parent folder is 'un-ignored' # This also avoids warnings when adding an already-checked file with an ignored parent. diff --git a/abs.yaml b/abs.yaml new file mode 100644 index 0000000..7754554 --- /dev/null +++ b/abs.yaml @@ -0,0 +1,6 @@ +# Turn off the overlinking check, because it gives a false positive on Windows. +# See https://github.com/conda/conda-build/issues/3650 +# We can't turn the check off for just Windows. +build_parameters: + - "--suppress-variables" + - "--skip-existing" \ No newline at end of file diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 52229a8..462cc76 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,2 +1,9 @@ arm_variant_type: # [aarch64] - sbsa # [aarch64] +conda_glibc_ver: + - 2.17 # [not aarch64] + - 2.26 # [aarch64] +cuda_compiler: + - cuda-nvcc +cuda_compiler_version: + - 12.4 \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9d62ba6..c30ef4a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -26,7 +26,7 @@ source: build: number: 0 - skip: true # [win32 or osx or cuda_compiler_version not in ("11.8", "12.0")] + skip: true # [win32 or osx or (linux and s390x)] script: - mkdir -p $PREFIX/include # [linux] - mv include/* $PREFIX/include/ # [linux] @@ -53,11 +53,13 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} - - arm-variant * {{ arm_variant_type }} # [aarch64] - - sysroot_{{ target_platform }} 2.17 # [linux] + #- arm-variant * {{ arm_variant_type }} # [aarch64] + - sysroot_{{ target_platform }} {{ conda_glibc_ver }}.* # [linux] host: - patchelf >=0.12 # [linux] - - cuda-version {{ cuda_major }}.0 + # Note that this is now usable with all cuda 12.x (see run pinning), so doesn't need to be + # rebuilt with a cuda update + - cuda-version {{ cuda_major }}.4 - libcublas # [(cuda_compiler_version or "").startswith("12")] run: - {{ pin_compatible("cuda-version", max_pin="x") }} @@ -65,16 +67,16 @@ requirements: - libcublas # [(cuda_compiler_version or "").startswith("12")] run_constrained: # Only GLIBC_2.17 or older symbols present - - __glibc >=2.17 # [linux] + - __glibc >={{ conda_glibc_ver }} # [linux] - arm-variant * {{ arm_variant_type }} # [aarch64] test: requires: - - git + - git # [not win] - {{ compiler('c') }} - {{ compiler('cxx') }} - {{ compiler('cuda') }} - - sysroot_{{ target_platform }} 2.17 # [linux] + - sysroot_{{ target_platform }} {{ conda_glibc_ver }}.* # [linux] # make sure we pick up the version matching the docker, # or the linker would complain - cudatoolkit {{ cuda_compiler_version }} # [(cuda_compiler_version or "").startswith("11")]