Merge pull request #39 from jeongseok-meta/adaptivecpp-enable-osx64-current

Enable osx-64 AdaptiveCpp builds

Author: jeongseok-meta

.azure-pipelines/azure-pipelines-osx.yml

@@ -0,0 +1,37 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '11.0'
+MACOSX_SDK_VERSION:
+- '11.0'
+c_compiler:
+- clang
+c_compiler_version:
+- '19'
+c_stdlib:
+- macosx_deployment_target
+c_stdlib_version:
+- '11.0'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cuda_compiler:
+- cuda-nvcc
+cuda_compiler_version:
+- None
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '19'
+libboost_devel:
+- '1.90'
+llvm_openmp:
+- '19'
+llvm_version:
+- '19'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+target_platform:
+- osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version

.ci_support/osx_64_.yaml

@@ -75,3 +75,11 @@ cmake \
 cmake --build build --parallel
 
 cmake --install build --strip
+
+if [[ "${target_platform}" == "osx-64" ]]; then
+  # Avoid recording the ephemeral build-env compiler in the new native macOS package.
+  sed -i.bak -E \
+    "s#\"default-cpu-cxx\"[[:space:]]*:[[:space:]]*\"[^\"]*\"#\"default-cpu-cxx\"   : \"${PREFIX}/bin/clang++\"#" \
+    "${PREFIX}/etc/AdaptiveCpp/acpp-core.json"
+  rm -f "${PREFIX}/etc/AdaptiveCpp/acpp-core.json.bak"
+fi

README.md

@@ -1,5 +1,8 @@
+c_stdlib_version:  # [osx and x86_64]
+  - '11.0'        # [osx and x86_64]
+
 llvm_version:
-  - 16
-  - 17
-  - 18
+  - 16  # [not (osx and x86_64)]
+  - 17  # [not (osx and x86_64)]
+  - 18  # [not (osx and x86_64)]
   - 19

recipe/build.sh

@@ -46,7 +46,6 @@ build:
     # https://conda-forge.org/docs/maintainer/knowledge_base/#nvcudadll-cannot-be-found-on-windows
     - "*/nvcuda.dll"    # [win]
     - "*/libcuda.so.1"  # [linux]
-  skip: true  # [osx and x86_64]
   skip: true  # [win and cuda_compiler_version == "13.0"]
   skip: true  # [linux and aarch64 and cuda_compiler_version != "None"]
   string: cpu_llvm{{ llvm_version }}_h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}  # [cuda_compiler_version == "None"]
@@ -87,7 +86,8 @@ requirements:
     - cuda-version {{ cuda_compiler_version }}
     {% endif %}
   run:
-    - clangdev  # [osx]
+    - clangdev {{ llvm_version }}  # [osx and x86_64]
+    - clangdev  # [osx and arm64]
     # The acpp driver defaults to the clang++ installed by clangxx.
     - clangxx {{ llvm_version }}  # [linux]
     - hip-runtime-amd  # [linux and x86_64]
@@ -114,6 +114,8 @@ test:
     - test -f $PREFIX/lib/hipSYCL/bitcode/libkernel-sscp-host-full.bc  # [linux]
     - test ! -e $PREFIX/lib/lib/hipSYCL/bitcode/libkernel-sscp-host-full.bc  # [linux]
     - test -x $PREFIX/lib/hipSYCL/llvm-to-backend/llvm-to-spirv-tool  # [linux]
+    - test -x $PREFIX/bin/clang++  # [osx and x86_64]
+    - "! grep -R \"_build_env.*/.*clang\" $PREFIX/etc/AdaptiveCpp/acpp-core.json"  # [osx and x86_64]
     - "test -x $PREFIX/bin/clang++-{{ llvm_version }} || test -x $PREFIX/bin/clang++"  # [linux]
     - "test -x $PREFIX/bin/opt-{{ llvm_version }} || test -x $PREFIX/bin/opt"  # [linux]
     - "test -x $PREFIX/bin/llc-{{ llvm_version }} || test -x $PREFIX/bin/llc"  # [linux]

recipe/conda_build_config.yaml

@@ -2,11 +2,19 @@
 
 set -exo pipefail
 
+cmake_extra_args=()
+
+if [[ "${target_platform}" == "osx-64" ]]; then
+  cmake_extra_args+=("-DACPP_TARGETS=omp")
+  cmake_extra_args+=("-DACPP_CPU_CXX=${CXX}")
+fi
+
 cmake tests \
     ${CMAKE_ARGS} \
     -G Ninja \
     -B tests/build \
     -DBUILD_SHARED_LIBS=ON \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    "${cmake_extra_args[@]}"
 
 cmake --build tests/build --parallel