Build against llvm 17 (#1489)

automerged PR by conda-forge/automerge-action
conda-forge · Jul 29, 2024 · 0bf071e · 0bf071e
2 parents 6422c21 + 0cd945d
commit 0bf071e
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 40 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...er_version11.8cxx_compiler_version11.yaml → ...er_version11.8cxx_compiler_version11.yaml b/...er_version11.8cxx_compiler_version11.yaml → ...er_version11.8cxx_compiler_version11.yaml
diff --git a/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml b/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml
diff --git a/...er_version11.8cxx_compiler_version10.yaml → ...er_version11.8cxx_compiler_version10.yaml b/...er_version11.8cxx_compiler_version10.yaml → ...er_version11.8cxx_compiler_version10.yaml
diff --git a/...er_versionNonecxx_compiler_version13.yaml → ...er_versionNonecxx_compiler_version13.yaml b/...er_versionNonecxx_compiler_version13.yaml → ...er_versionNonecxx_compiler_version13.yaml
diff --git a/...er_version11.8cxx_compiler_version10.yaml → ...er_version11.8cxx_compiler_version10.yaml b/...er_version11.8cxx_compiler_version10.yaml → ...er_version11.8cxx_compiler_version10.yaml
diff --git a/...er_versionNonecxx_compiler_version13.yaml → ...er_versionNonecxx_compiler_version13.yaml b/...er_versionNonecxx_compiler_version13.yaml → ...er_versionNonecxx_compiler_version13.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -19,7 +19,7 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -33,7 +33,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 gflags:
 - '2.2'
 glog:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -19,7 +19,7 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '16'
+- '17'
 c_stdlib:
 - macosx_deployment_target
 c_stdlib_version:
@@ -33,7 +33,7 @@ cuda_compiler_version:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '16'
+- '17'
 gflags:
 - '2.2'
 glog:

diff --git a/...ort/win_64_cuda_compiler_versionNone.yaml → ...ompilerNonecuda_compiler_versionNone.yaml b/...ort/win_64_cuda_compiler_versionNone.yaml → ...ompilerNonecuda_compiler_versionNone.yaml
diff --git a/...ort/win_64_cuda_compiler_version11.8.yaml → ...ompilernvcccuda_compiler_version11.8.yaml b/...ort/win_64_cuda_compiler_version11.8.yaml → ...ompilernvcccuda_compiler_version11.8.yaml
diff --git a/README.md b/README.md
diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -2,10 +2,10 @@
 # linux-aarch hits a compiler bug with GCC 12, upgrade; needs override
 # for two versions on linux: one for non-CUDA & one for 11.8
 c_compiler_version:            # [unix]
-  - 16                         # [osx]
+  - 17                         # [osx]
   - 13                         # [linux and (aarch64 or ppc64le)]
   - 10                         # [linux and (aarch64 or ppc64le)]
 cxx_compiler_version:          # [unix]
-  - 16                         # [osx]
+  - 17                         # [osx]
   - 13                         # [linux and (aarch64 or ppc64le)]
   - 10                         # [linux and (aarch64 or ppc64le)]
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -3,7 +3,7 @@
 {% set build_ext_version = "5.0.0" %}
 {% set build_ext = "cuda" if cuda_enabled else "cpu" %}
 {% set proc_build_number = "0" %}
-{% set llvm_version = "16" %}
+{% set llvm_version = "17" %}
 
 # see https://github.com/apache/arrow/blob/apache-arrow-10.0.1/cpp/CMakeLists.txt#L88-L90
 {% set so_version = (version.split(".")[0] | int * 100 + version.split(".")[1] | int) ~ "." ~ version.split(".")[2] ~ ".0" %}
@@ -22,7 +22,7 @@ source:
     folder: testing
 
 build:
-  number: 2
+  number: 3
   # for cuda support, building with one version is enough to be compatible with
   # all later versions, since arrow is only using libcuda, and not libcudart.
   skip: true  # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]