Merge pull request #288 from h-vetinari/19

llvmdev v19.1.0
conda-forge · Sep 18, 2024 · dd9cd75 · dd9cd75
2 parents b6ead7f + 83132cf
commit dd9cd75
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 91 deletions.
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libxml2:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -15,7 +15,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libxml2:

diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml
@@ -11,7 +11,7 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 libxml2:

diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '16'
+- '17'
 libxml2:
 - '2'
 macos_machine:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -13,7 +13,7 @@ channel_targets:
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '16'
+- '17'
 libxml2:
 - '2'
 macos_machine:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -39,5 +39,7 @@ if %ERRORLEVEL% neq 0 exit 1
 REM bin\opt -S -vector-library=SVML -mcpu=haswell -O3 %RECIPE_DIR%\numba-3016.ll | bin\FileCheck %RECIPE_DIR%\numba-3016.ll
 REM if %ERRORLEVEL% neq 0 exit 1
 
+:: takes ~30min
 cd ..\llvm\test
 python ..\..\build\bin\llvm-lit.py -vv Transforms ExecutionEngine Analysis CodeGen/X86
+if %ERRORLEVEL% neq 0 exit 1
diff --git a/recipe/build.sh b/recipe/build.sh
@@ -1,4 +1,5 @@
-set -x
+#!/bin/bash
+set -exuo pipefail
 
 # Make osx work like linux.
 sed -i.bak "s/NOT APPLE AND ARG_SONAME/ARG_SONAME/g" llvm/cmake/modules/AddLLVM.cmake
@@ -67,17 +68,15 @@ else
     export TEST_CPU_FLAG=""
 fi
 
-# should be [[ "$CONDA_BUILD_CROSS_COMPILATION" != "1" ]],
-# but osx builds time out when building & running test suite
-if [[ "$target_platform" == "linux-64" ]]; then
+if [[ ${CONDA_BUILD_CROSS_COMPILATION:-0} != "1" ]]; then
   # bin/opt -S -vector-library=SVML $TEST_CPU_FLAG -O3 $RECIPE_DIR/numba-3016.ll | bin/FileCheck $RECIPE_DIR/numba-3016.ll || exit $?
 
   if [[ "$target_platform" == linux* ]]; then
     ln -s $(which $CC) $BUILD_PREFIX/bin/gcc
+    # check-llvm takes >1.5h to build & run on osx
+    ninja -j${CPU_COUNT} check-llvm
   fi
 
-  ninja -j${CPU_COUNT} check-llvm
-
   cd ../llvm/test
   python ../../build/bin/llvm-lit -vv Transforms ExecutionEngine Analysis CodeGen/X86
 fi
diff --git a/recipe/install_llvm.sh b/recipe/install_llvm.sh
@@ -6,14 +6,16 @@ IFS='.' read -ra VER_ARR <<< "$PKG_VERSION"
 # temporary prefix to be able to install files more granularly
 mkdir temp_prefix
 
-MAJOR_EXT="${VER_ARR[0]}"
+MAJOR_VER="${VER_ARR[0]}"
+MAJOR_EXT="${MAJOR_VER}"
 # default SOVER for tagged releases is major.minor version
 SOVER_EXT="${VER_ARR[0]}.${VER_ARR[1]}"
 # for rc's, both MAJOR_EXT & SOVER_EXT get suffixes
 if [[ "${PKG_VERSION}" == *rc* ]]; then
-    # rc's get "rc" without the number
-    MAJOR_EXT="${MAJOR_EXT}rc"
-    SOVER_EXT="${SOVER_EXT}rc"
+    # rc's get "-rcX" suffix; in this case, PKG_VERSION has 4 parts,
+    # (e.g. 19.1.0.rc1), so take the last part after splitting on "."
+    MAJOR_EXT="${MAJOR_EXT}-${VER_ARR[3]}"
+    SOVER_EXT="${SOVER_EXT}-${VER_ARR[3]}"
 elif [[ "${PKG_VERSION}" == *dev0 ]]; then
     # otherwise with git suffix
     MAJOR_EXT="${MAJOR_EXT}git"
@@ -30,22 +32,22 @@ elif [[ "${PKG_NAME}" == libllvm* ]]; then
     mv ./temp_prefix/lib/libLLVM-${MAJOR_EXT}${SHLIB_EXT} $PREFIX/lib
     mv ./temp_prefix/lib/lib*.so.${SOVER_EXT} $PREFIX/lib || true
     mv ./temp_prefix/lib/lib*.${SOVER_EXT}.dylib $PREFIX/lib || true
-elif [[ "${PKG_NAME}" == "llvm-tools-${MAJOR_EXT}" ]]; then
+elif [[ "${PKG_NAME}" == "llvm-tools-${MAJOR_VER}" ]]; then
     cmake --install ./build --prefix=./temp_prefix
-    # install all binaries with a -${MAJOR_EXT}
+    # install all binaries with a -${MAJOR_VER}
     pushd ./temp_prefix
       for f in bin/*; do
-        cp $f $PREFIX/bin/$(basename $f)-${MAJOR_EXT}
+        cp $f $PREFIX/bin/$(basename $f)-${MAJOR_VER}
       done
     popd
     # except one binary that belongs to llvmdev
-    rm $PREFIX/bin/llvm-config-${MAJOR_EXT}
+    rm $PREFIX/bin/llvm-config-${MAJOR_VER}
 elif [[ "${PKG_NAME}" == "llvm-tools" ]]; then
     cmake --install ./build --prefix=./temp_prefix
     # Install a symlink without the major version
     pushd ./temp_prefix
       for f in bin/*; do
-        ln -sf $PREFIX/bin/$(basename $f)-${MAJOR_EXT} $PREFIX/bin/$(basename $f)
+        ln -sf $PREFIX/bin/$(basename $f)-${MAJOR_VER} $PREFIX/bin/$(basename $f)
       done
     popd
     # opt-viewer tool