Set -DLIBOMP_FORTRAN_MODULES=ON on windows

recipe/build-pkg.bat → recipe/bld.bat

@@ -20,19 +20,9 @@ cmake -G "Ninja" ^
     -DCMAKE_BUILD_TYPE="Release" ^
     -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
     -DCMAKE_INSTALL_PREFIX:PATH=%LIBRARY_PREFIX% ^
+    -DLIBOMP_FORTRAN_MODULES=ON ^
     ..
 if %ERRORLEVEL% neq 0 exit 1
 
-cmake --build . --target install
-if %ERRORLEVEL% neq 0 exit 1
-
-:: delete libiomp5md.dll which is incorrectly copied over in the build
-:: del /F /Q %LIBRARY_PREFIX%\bin\libiomp5md.dll
-:: del /F /Q %LIBRARY_PREFIX%\lib\libiomp5md.dll
-
-if not exist "%LIBRARY_PREFIX%\lib\clang\%PKG_VERSION%\include\" mkdir "%LIBRARY_PREFIX%\lib\clang\%PKG_VERSION%\include"
-if %ERRORLEVEL% neq 0 exit 1
-
-:: Standalone libomp build doesn't put omp.h in clang's default search path
-cp %LIBRARY_PREFIX%\include\omp.h %LIBRARY_PREFIX%\lib\clang\%PKG_VERSION%\include
+cmake --build .
 if %ERRORLEVEL% neq 0 exit 1

recipe/build-pkg.sh → recipe/build.sh

@@ -50,14 +50,3 @@ cmake -G Ninja \
     ..
 
 cmake --build .
-cmake --install .
-
-rm -f $PREFIX/lib/libgomp$SHLIB_EXT
-
-mkdir -p $PREFIX/lib/clang/$PKG_VERSION/include
-# Standalone libomp build doesn't put omp.h in clang's default search path
-cp $PREFIX/include/omp.h $PREFIX/lib/clang/$PKG_VERSION/include
-if [[ "$target_platform" == linux-* ]]; then
-  # move libarcher.so so that it doesn't interfere
-  mv $PREFIX/lib/libarcher.so $PREFIX/lib/libarcher.so.bak
-fi

recipe/conda_build_config.yaml

@@ -0,0 +1,4 @@
+fortran_compiler:           # [win]
+  - flang                   # [win]
+fortran_compiler_version:   # [win]
+  - 19                      # [win]

recipe/install_pkg.bat

@@ -0,0 +1,19 @@
+@echo on
+
+cd openmp/build
+
+cmake --install .
+if %ERRORLEVEL% neq 0 exit 1
+
+if not exist "%LIBRARY_PREFIX%\lib\clang\%PKG_VERSION%\include\" mkdir "%LIBRARY_PREFIX%\lib\clang\%PKG_VERSION%\include"
+if %ERRORLEVEL% neq 0 exit 1
+
+:: Standalone libomp build doesn't put omp.h in clang's default search path
+cp %LIBRARY_PREFIX%\include\omp.h %LIBRARY_PREFIX%\lib\clang\%PKG_VERSION%\include
+if %ERRORLEVEL% neq 0 exit 1
+
+:: remove fortran bits from regular llvm-openmp package
+if "%PKG_NAME%" NEQ "llvm-openmp-fortran" (
+    del /s /q %LIBRARY_INC%\omp_lib.mod
+    del /s /q %LIBRARY_INC%\omp_lib_kinds.mod
+)

recipe/install_pkg.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ex
+
+cd openmp/build
+
+cmake --install .
+
+rm -f $PREFIX/lib/libgomp$SHLIB_EXT
+
+mkdir -p $PREFIX/lib/clang/$PKG_VERSION/include
+# Standalone libomp build doesn't put omp.h in clang's default search path
+cp $PREFIX/include/omp.h $PREFIX/lib/clang/$PKG_VERSION/include
+if [[ "$target_platform" == linux-* ]]; then
+  # move libarcher.so so that it doesn't interfere
+  mv $PREFIX/lib/libarcher.so $PREFIX/lib/libarcher.so.bak
+fi

recipe/meta.yaml

@@ -19,32 +19,40 @@ source:
     - patches/0001-link-libomp-to-compiler-rt-on-osx-arm.patch
 
 build:
-  number: 0
+  number: 1
+
+requirements:
+  build:
+    - {{ stdlib("c") }}
+    - {{ compiler("cxx") }}
+    - {{ compiler("fortran") }}  # [win]
+    - clang                      # [win]
+    - cmake
+    - ninja
+  host:
+    - llvmdev {{ version }}
+    # see https://github.com/llvm/llvm-project/issues/54596
+    - compiler-rt   # [osx and arm64]
 
 outputs:
   - name: llvm-openmp
-    script: build-pkg.sh   # [unix]
-    script: build-pkg.bat  # [win]
+    script: install_pkg.sh   # [unix]
+    script: install_pkg.bat  # [win]
     build:
       ignore_run_exports_from:
         - {{ compiler("cxx") }}
+        - {{ compiler("fortran") }}
       run_exports:
         strong:
           - {{ pin_subpackage("llvm-openmp", max_pin=None) }}
           - _openmp_mutex >={{ openmp_ver }}  # [linux]
           - _openmp_mutex * *_llvm            # [linux]
     requirements:
       build:
+        - cmake
+        # for run-exports
         - {{ stdlib("c") }}
         - {{ compiler("cxx") }}
-        - clang  # [win]
-        - cmake
-        - ninja
-        - perl
-      host:
-        - llvmdev {{ version }}|{{ version }}.*
-        # see https://github.com/llvm/llvm-project/issues/54596
-        - compiler-rt  # [osx and arm64]
       run_constrained:
         - openmp {{ version }}|{{ version }}.*
     test:
@@ -58,6 +66,12 @@ outputs:
         - test -f $PREFIX/include/omp.h                   # [unix]
         - if not exist %LIBRARY_INC%\omp.h exit 1         # [win]
 
+        # absence of fortran bits
+        - test ! -f $PREFIX/include/omp_lib.mod             # [linux]
+        - test ! -f $PREFIX/include/omp_lib_kinds.mod       # [linux]
+        - if exist %LIBRARY_INC%\omp_lib.mod exit 1         # [win]
+        - if exist %LIBRARY_INC%\omp_lib_kinds.mod exit 1   # [win]
+
         # shared library
         - test -f $PREFIX/lib/libomp.so                   # [linux]
         - test -f $PREFIX/lib/libomp.dylib                # [osx]
@@ -71,6 +85,38 @@ outputs:
         - ./omp_hello            # [unix]
         - '%cd%\omp_hello.exe'   # [win]
 
+  - name: llvm-openmp-fortran
+    script: install_pkg.sh   # [unix]
+    script: install_pkg.bat  # [win]
+    build:
+      # restricted to windows for now
+      skip: true  # [not win]
+      run_exports:
+        strong:
+          - {{ pin_subpackage("llvm-openmp", max_pin=None) }}
+          - _openmp_mutex >={{ openmp_ver }}  # [linux]
+          - _openmp_mutex * *_llvm            # [linux]
+    requirements:
+      build:
+        - cmake
+        # for run-exports
+        - {{ stdlib("c") }}
+        - {{ compiler("cxx") }}
+        - {{ compiler("fortran") }}     # [linux]
+      host:
+        - {{ pin_subpackage("llvm-openmp", exact=True) }}
+      run:
+        - {{ pin_subpackage("llvm-openmp", exact=True) }}
+      run_constrained:
+        # already contains the version
+        - {{ compiler("fortran") }}
+    test:
+      commands:
+        - test -f $PREFIX/include/omp_lib.mod                   # [linux]
+        - test -f $PREFIX/include/omp_lib_kinds.mod             # [linux]
+        - if not exist %LIBRARY_INC%\omp_lib.mod exit 1         # [win]
+        - if not exist %LIBRARY_INC%\omp_lib_kinds.mod exit 1   # [win]
+
 about:
   home: http://openmp.llvm.org/
   license: Apache-2.0 WITH LLVM-exception