ENH 11 rc1

automerged PR by conda-forge/automerge-action
conda-forge · Oct 14, 2020 · 2bd2e5a · 2bd2e5a
2 parents 78c1e1c + 57e165d
commit 2bd2e5a
Show file tree

Hide file tree

Showing 20 changed files with 115 additions and 69 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...upport/linux_target_platformlinux-64.yaml → ...ort/linux_64_target_platformlinux-64.yaml b/...upport/linux_target_platformlinux-64.yaml → ...ort/linux_64_target_platformlinux-64.yaml
@@ -1,7 +1,7 @@
 channel_sources:
-- conda-forge,defaults
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -15,5 +15,3 @@ pin_run_as_build:
     max_pin: x.x.x
 target_platform:
 - linux-64
-vc:
-- '14'
diff --git a/.ci_support/linux_aarch64_target_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_target_platformlinux-aarch64.yaml
@@ -5,9 +5,9 @@ cdt_arch:
 cdt_name:
 - cos7
 channel_sources:
-- conda-forge
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -21,5 +21,3 @@ pin_run_as_build:
     max_pin: x.x.x
 target_platform:
 - linux-aarch64
-vc:
-- '14'
diff --git a/.ci_support/linux_ppc64le_target_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_target_platformlinux-ppc64le.yaml
@@ -1,7 +1,7 @@
 channel_sources:
-- conda-forge,defaults
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
 cxx_compiler:
 - gxx
 cxx_compiler_version:
@@ -15,5 +15,3 @@ pin_run_as_build:
     max_pin: x.x.x
 target_platform:
 - linux-ppc64le
-vc:
-- '14'
diff --git a/.ci_support/osx_target_platformosx-64.yaml → ...support/osx_64_target_platformosx-64.yaml b/.ci_support/osx_target_platformosx-64.yaml → ...support/osx_64_target_platformosx-64.yaml
@@ -1,13 +1,13 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
 channel_sources:
-- conda-forge,defaults
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
 cxx_compiler:
 - clang_bootstrap
 cxx_compiler_version:
-- '*'
+- '10'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
@@ -19,5 +19,3 @@ pin_run_as_build:
     max_pin: x.x.x
 target_platform:
 - osx-64
-vc:
-- '14'
diff --git a/.ci_support/osx_arm64_target_platformosx-arm64.yaml b/.ci_support/osx_arm64_target_platformosx-arm64.yaml
@@ -0,0 +1,21 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '11.0'
+channel_sources:
+- conda-forge/label/llvm_rc,conda-forge,https://conda-web.anaconda.org/conda-forge
+channel_targets:
+- conda-forge llvm_rc
+cxx_compiler:
+- clang_bootstrap
+cxx_compiler_version:
+- '11'
+macos_machine:
+- arm64-apple-darwin20.0.0
+macos_min_version:
+- '11.0'
+perl:
+- 5.26.2
+pin_run_as_build:
+  perl:
+    max_pin: x.x.x
+target_platform:
+- osx-arm64
diff --git a/.ci_support/win_target_platformwin-64.yaml → .ci_support/win_64_.yaml b/.ci_support/win_target_platformwin-64.yaml → .ci_support/win_64_.yaml
@@ -1,7 +1,9 @@
 channel_sources:
-- conda-forge,defaults
+- conda-forge/label/llvm_rc,conda-forge,defaults
 channel_targets:
-- conda-forge main
+- conda-forge llvm_rc
+cxx_compiler:
+- vs2017
 perl:
 - 5.26.2
 pin_run_as_build:

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/.travis.yml b/.travis.yml
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -2,3 +2,7 @@ provider:
   linux_ppc64le: default
   linux_aarch64: default
 conda_forge_output_validation: true
+build_platform:
+  osx_arm64: osx_64
+test_on_native_only: true
+channel_priority: flexible
diff --git a/recipe/build-llvm-openmp.sh b/recipe/build-llvm-openmp.sh
@@ -1,27 +1,26 @@
 mkdir build
 cd build
 
-if [[ "${target_platform}" == "osx-64" ]]; then
+if [[ "${target_platform}" == osx-* ]]; then
   # See https://github.com/AnacondaRecipes/aggregate/issues/107
-  export CPPFLAGS="-mmacosx-version-min=10.9 -I${PREFIX}/include -D_FORTIFY_SOURCE=2"
+  export CPPFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} -isystem ${PREFIX}/include -D_FORTIFY_SOURCE=2"
 fi
 
 if [[ "${target_platform}" == "linux"* ]]; then
   export LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
 fi
 
-if [[ "${target_platform}" == "osx-64" ]]; then
-  export CFLAG="$CFLAGS -mlinker-version=305"
-  export CXXFLAGS="$CXXFLAGS -mlinker-version=305"
+if [[ "${PKG_VERSION}" == *rc* ]]; then
+  export PKG_VERSION=${PKG_VERSION::${#PKG_VERSION}-4}
 fi
 
-cmake \
+cmake ${CMAKE_ARGS} \
     -DCMAKE_INSTALL_PREFIX=$PREFIX \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH=$PREFIX \
     ..
 
-make -j${CPU_COUNT}
+make -j${CPU_COUNT} VERBOSE=1
 make install
 
 rm -f $PREFIX/lib/libgomp$SHLIB_EXT

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -1,16 +1,4 @@
-cxx_compiler:
+cxx_compiler:        # [osx]
   - clang_bootstrap  # [osx]
-  - gxx              # [linux]
-  - vs2017           # [win]
-c_compiler:
+c_compiler:          # [osx]
   - clang_bootstrap  # [osx]
-  - gcc              # [linux]
-  - vs2017           # [win]
-vc:
-  - 14
-python:
-  - 3.7
-c_compiler_version:     # [osx]
-  - "*"                 # [osx]
-cxx_compiler_version:   # [osx]
-  - "*"                 # [osx]
diff --git a/recipe/darwin_arm64.patch b/recipe/darwin_arm64.patch
@@ -0,0 +1,24 @@
+--- runtime/src/z_Linux_asm.S   2020-09-02 18:03:36.268029852 -0500
++++ runtime/src/z_Linux_asm.S   2020-09-02 18:04:57.512849121 -0500
+@@ -1742,6 +1742,14 @@
+ #endif /* KMP_ARCH_ARM */
+
+ #if KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 || KMP_ARCH_RISCV64
++# if KMP_OS_DARWIN
++    .data
++    .comm .gomp_critical_user_,32
++    .data
++    .globl ___kmp_unnamed_critical_addr
++___kmp_unnamed_critical_addr:
++    .quad .gomp_critical_user_
++#else
+     .data
+     .comm .gomp_critical_user_,32,8
+     .data
+@@ -1750,6 +1758,7 @@
+ __kmp_unnamed_critical_addr:
+     .8byte .gomp_critical_user_
+     .size __kmp_unnamed_critical_addr,8
++#endif /* KMP_OS_DARWIN */
+ #endif /* KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 ||
+           KMP_ARCH_RISCV64 */
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,15 +1,17 @@
 {% set name = "openmp" %}
-{% set version = "10.0.1" %}
-{% set sha256 = "d19f728c8e04fb1e94566c8d76aef50ec926cd2f95ef3bf1e0a5de4909b28b44" %}
+{% set version = "11.0.0" %}
+{% set sha256 = "2d704df8ca67b77d6d94ebf79621b0f773d5648963dd19e0f78efef4404b684c" %}
 {% set openmp_ver = "4.5" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
-  url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version }}/openmp-{{ version }}.src.tar.xz
+  url: https://github.com/llvm/llvm-project/releases/download/llvmorg-{{ version.replace(".rc", "-rc") }}/openmp-{{ version.replace(".rc", "rc") }}.src.tar.xz
   sha256: {{ sha256 }}
+  patches:
+    - darwin_arm64.patch
 
 build:
   number: 0
@@ -31,8 +33,7 @@ outputs:
           - _openmp_mutex * *_llvm            # [linux]
     requirements:
       build:
-        - {{ compiler('cxx') }}  # [unix]
-        - vs2017_{{ target_platform }}  # [win]
+        - {{ compiler('cxx') }}
         - cmake
         - make  # [unix]
         - perl
@@ -46,8 +47,7 @@ outputs:
     test:
       requires:
         - clangxx
-        - {{ compiler('cxx') }}  # [unix]
-        - vs2017_{{ target_platform }}  # [win]
+        - {{ compiler('cxx') }}
       commands:
         - if not exist %LIBRARY_BIN%\\libomp.dll exit 1   # [win]
         - test -f $PREFIX/lib/libomp.so                   # [linux]