openmp v19.1.0

.ci_support/linux_64_.yaml

@@ -1,27 +1,29 @@
 c_stdlib:
 - sysroot
 c_stdlib_version:
-- '2.12'
+- '2.17'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '13'
 perl:
 - 5.32.1
 target_platform:
 - linux-64
 zip_keys:
 - - c_stdlib_version
   - cdt_name
-zlib:
-- '1'
-zstd:
-- '1.5'
+- - cxx_compiler_version
+  - fortran_compiler_version

.ci_support/linux_aarch64_.yaml

@@ -15,17 +15,19 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '13'
 perl:
 - 5.32.1
 target_platform:
 - linux-aarch64
 zip_keys:
 - - c_stdlib_version
   - cdt_name
-zlib:
-- '1'
-zstd:
-- '1.5'
+- - cxx_compiler_version
+  - fortran_compiler_version

.ci_support/linux_ppc64le_.yaml

@@ -11,17 +11,19 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '12'
+- '13'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '13'
 perl:
 - 5.32.1
 target_platform:
 - linux-ppc64le
 zip_keys:
 - - c_stdlib_version
   - cdt_name
-zlib:
-- '1'
-zstd:
-- '1.5'
+- - cxx_compiler_version
+  - fortran_compiler_version

.ci_support/osx_64_.yaml

@@ -11,12 +11,19 @@ channel_sources:
 channel_targets:
 - conda-forge main
 cxx_compiler:
-- clang_bootstrap
+- clangxx
 cxx_compiler_version:
-- '16'
+- '17'
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '13'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 perl:
 - 5.32.1
 target_platform:
 - osx-64
+zip_keys:
+- - cxx_compiler_version
+  - fortran_compiler_version

.ci_support/osx_arm64_.yaml

@@ -11,12 +11,19 @@ channel_sources:
 channel_targets:
 - conda-forge main
 cxx_compiler:
-- clang_bootstrap
+- clangxx
 cxx_compiler_version:
-- '16'
+- '17'
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '13'
 macos_machine:
 - arm64-apple-darwin20.0.0
 perl:
 - 5.32.1
 target_platform:
 - osx-arm64
+zip_keys:
+- - cxx_compiler_version
+  - fortran_compiler_version

.ci_support/win_64_.yaml

@@ -6,6 +6,10 @@ channel_targets:
 - conda-forge main
 cxx_compiler:
 - vs2019
+fortran_compiler:
+- flang
+fortran_compiler_version:
+- '19'
 perl:
 - 5.32.1
 target_platform:

conda-forge.yml

@@ -2,13 +2,18 @@ bot:
   abi_migration_branches:
   - 17.x
   - 16.x
-build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64}
+build_platform:
+  linux_aarch64: linux_64
+  linux_ppc64le: linux_64
+  osx_arm64: osx_64
+conda_build:
+  pkg_format: '2'
+  error_overlinking: true
 conda_forge_output_validation: true
-provider: {linux_aarch64: azure, linux_ppc64le: azure}
 github:
   branch_name: main
   tooling_branch_name: main
-conda_build:
-  pkg_format: '2'
-  error_overlinking: true
+provider:
+  linux_aarch64: azure
+  linux_ppc64le: azure
 test: native_and_emulated

recipe/build-pkg.sh

@@ -31,9 +31,6 @@ fi
 
 if [[ "${target_platform}" == "linux"* ]]; then
   export LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
-fi
-
-if [[ "${target_platform}" == "linux"* ]]; then
   # This should have been defined by HandleLLVMOptions.cmake
   # Not sure why it is not.
   export CXXFLAGS="$CXXFLAGS -D__STDC_FORMAT_MACROS"

recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "18.1.8" %}
+{% set version = "19.1.0" %}
 # check https://clang.llvm.org/docs/OpenMPSupport.html
 # occasionally to see last fully supported openmp ver.
 {% set openmp_ver = "4.5" %}
@@ -9,44 +9,40 @@ package:
 
 source:
   url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz
-  sha256: 09c08693a9afd6236f27a2ebae62cda656eba19021ef3f94d59e931d662d4856
+  sha256: 0a08341036ca99a106786f50f9c5cb3fbe458b3b74cab6089fd368d0edb2edfe
   # name folder for easier deletion; we do the equivalent of downloading
   # the subproject sources, so the work folder then has openmp in it;
   # for details see build scripts
   folder: llvm-project
   patches:
-    # backport https://github.com/llvm/llvm-project/pull/80174
-    - patches/0001-openmp-On-Windows-fix-standalone-cmake-build.patch
-    # intermediate fix for https://github.com/llvm/llvm-project/issues/54596
-    - patches/0002-link-libomp-to-compiler-rt-on-osx-arm.patch
+    # fix for https://github.com/llvm/llvm-project/issues/54596
+    - patches/0001-link-libomp-to-compiler-rt-on-osx-arm.patch
 
 build:
-  number: 1
+  number: 0
 
 outputs:
   - name: llvm-openmp
     script: build-pkg.sh   # [unix]
     script: build-pkg.bat  # [win]
     build:
       ignore_run_exports_from:
-        - {{ compiler('cxx') }}
+        - {{ compiler("cxx") }}
       run_exports:
         strong:
           - {{ pin_subpackage("llvm-openmp", max_pin=None) }}
           - _openmp_mutex >={{ openmp_ver }}  # [linux]
           - _openmp_mutex * *_llvm            # [linux]
     requirements:
       build:
-        - {{ compiler('cxx') }}
         - {{ stdlib("c") }}
+        - {{ compiler("cxx") }}
         - clang  # [win]
         - cmake
         - ninja
         - perl
       host:
         - llvmdev {{ version }}|{{ version }}.*
-        - zlib   # [linux]
-        - zstd   # [linux]
         # see https://github.com/llvm/llvm-project/issues/54596
         - compiler-rt  # [osx and arm64]
       run_constrained:

recipe/patches/0002-link-libomp-to-compiler-rt-on-osx-arm.patch → recipe/patches/0001-link-libomp-to-compiler-rt-on-osx-arm.patch

@@ -1,18 +1,18 @@
-From 9fd9c8c26219bf8995321b7786e853d6c51e1dc8 Mon Sep 17 00:00:00 2001
+From 15211abaf2331a43855f09978bda20b030fffd25 Mon Sep 17 00:00:00 2001
 From: "H. Vetinari" <h.vetinari@gmx.com>
 Date: Thu, 1 Feb 2024 12:29:07 +0100
-Subject: [PATCH 2/2] link libomp to compiler-rt on osx-arm
+Subject: [PATCH] link libomp to compiler-rt on osx-arm
 
 ---
  openmp/runtime/src/CMakeLists.txt | 6 ++++++
  1 file changed, 6 insertions(+)
 
 diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
-index 619d4f7ba458..11d9c969e381 100644
+index f106694841ce..6a016b76f4b6 100644
 --- a/openmp/runtime/src/CMakeLists.txt
 +++ b/openmp/runtime/src/CMakeLists.txt
-@@ -161,6 +161,12 @@ if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING))
-   add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
+@@ -175,6 +175,12 @@ if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING))
+   set_property(TARGET omp PROPERTY FOLDER "OpenMP/Libraries")
    # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
    target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS})
 +  if(APPLE AND CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")