summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Donjon/src/Makefile3
-rw-r--r--Dragon/src/Makefile3
-rw-r--r--Ganlib/src/Makefile3
-rw-r--r--PyGan/src/Makefile5
-rw-r--r--PyGan/src/setup_cle2000.py163
-rw-r--r--Trivac/src/Makefile3
-rw-r--r--Utilib/src/Makefile3
8 files changed, 174 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index a345707..04d7f9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ Trivac/src/Trivac
*.o
*.mod
*.a
+*.mk
.DS_Store
diff --git a/Donjon/src/Makefile b/Donjon/src/Makefile
index b68f26a..a7502b1 100644
--- a/Donjon/src/Makefile
+++ b/Donjon/src/Makefile
@@ -164,6 +164,9 @@ else
FFLAGS += -mmlir -fdynamic-heap-array
ifeq ($(OS),Darwin)
LFLAGS += -lclang_rt.osx
+ ifeq ($(openmp),1)
+ LFLAGS += -L/opt/homebrew/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp
+ endif
endif
else
lib = ../lib/$(DIRNAME)
diff --git a/Dragon/src/Makefile b/Dragon/src/Makefile
index 0af9e76..323c952 100644
--- a/Dragon/src/Makefile
+++ b/Dragon/src/Makefile
@@ -160,6 +160,9 @@ else
FFLAGS += -mmlir -fdynamic-heap-array
ifeq ($(OS),Darwin)
LFLAGS += -lclang_rt.osx
+ ifeq ($(openmp),1)
+ LFLAGS += -L/opt/homebrew/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp
+ endif
endif
else
lib = ../lib/$(DIRNAME)
diff --git a/Ganlib/src/Makefile b/Ganlib/src/Makefile
index 4235f13..98ee311 100644
--- a/Ganlib/src/Makefile
+++ b/Ganlib/src/Makefile
@@ -154,6 +154,9 @@ else
FFLAGS += -mmlir -fdynamic-heap-array
ifeq ($(OS),Darwin)
LFLAGS += -lclang_rt.osx
+ ifeq ($(openmp),1)
+ LFLAGS += -L/opt/homebrew/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp
+ endif
endif
else
lib = ../lib/$(DIRNAME)
diff --git a/PyGan/src/Makefile b/PyGan/src/Makefile
index 8520eef..eafb150 100644
--- a/PyGan/src/Makefile
+++ b/PyGan/src/Makefile
@@ -191,8 +191,7 @@ endif
@echo 'makefile PYTHONPATH=' $(PYTHONPATH)
clean:
@echo 'clean PyGan'
- @echo '**********************************************'
- @echo '*** You should also clean Dragon or Donjon ***'
- @echo '**********************************************'
+ $(MAKE) -C ../../Dragon/src clean
+ $(MAKE) -C ../../Donjon/src clean
/bin/rm -r -f ../lib
/bin/rm -f sub-make*
diff --git a/PyGan/src/setup_cle2000.py b/PyGan/src/setup_cle2000.py
index c712b26..4b97458 100644
--- a/PyGan/src/setup_cle2000.py
+++ b/PyGan/src/setup_cle2000.py
@@ -8,7 +8,8 @@ elif version_info[0] > 3:
from setuptools import setup, Extension
else:
from distutils.core import setup, Extension
-import sysconfig
+import sys
+import os
def _detect_gfortran_dir():
import subprocess, os
@@ -22,13 +23,161 @@ def _detect_gfortran_dir():
pass
return None
+def _has_any(paths):
+ for p in paths:
+ if any(os.path.exists(pfx) for pfx in _expand_suffixes(p)):
+ return True
+ return False
+
+def _expand_suffixes(base):
+ # Consider common library suffixes across UNIX
+ # Static is last resort; we prefer shared for Python extension link
+ exts = ['.dylib', '.so', '.a']
+ return [base + ext for ext in exts]
+
+def _detect_flang_dir():
+ """Best-effort detection of the flang/Fortran runtime library directory on UNIX.
+ Priority order:
+ 1) FLANGLIB or FLANG_LIBDIR (explicit path)
+ 2) From LLVMTOOLS (../lib or ../lib64)
+ 3) llvm-config --libdir
+ 4) flang-new location heuristic (bin -> lib or sibling llvm lib)
+ 5) Homebrew (macOS): brew --prefix flang, then /opt/homebrew/opt/flang/lib
+ 6) Common system locations (/usr/lib, /usr/lib64, /usr/local/lib, /opt/local/lib)
+ Returns the first directory that appears to contain flang/Fortran runtime libs.
+ """
+ import subprocess
+ candidates = []
+
+ # 1) Explicit overrides
+ for env_name in ('FLANGLIB', 'FLANG_LIBDIR'):
+ d = os.environ.get(env_name)
+ if d and os.path.isdir(d):
+ candidates.append(d)
+
+ # 2) Derive from LLVMTOOLS (often a bin path)
+ t = os.environ.get('LLVMTOOLS')
+ if t:
+ for sub in ('..',):
+ for libname in ('lib', 'lib64'):
+ cand = os.path.abspath(os.path.join(t, sub, libname))
+ if os.path.isdir(cand):
+ candidates.append(cand)
+
+ # 3) llvm-config --libdir
+ try:
+ libdir = subprocess.check_output(['llvm-config', '--libdir'], text=True).strip()
+ if os.path.isdir(libdir):
+ candidates.append(libdir)
+ except Exception:
+ pass
+
+ # 4) Locate flang-new executable and probe nearby
+ try:
+ fl = subprocess.check_output(['which', 'flang-new'], text=True).strip()
+ if fl and os.path.isabs(fl):
+ base = os.path.dirname(os.path.dirname(fl)) # prefix
+ for libname in ('lib', 'lib64'):
+ cand = os.path.join(base, libname)
+ if os.path.isdir(cand):
+ candidates.append(cand)
+ except Exception:
+ pass
+
+ # 5) macOS Homebrew
+ if sys.platform == 'darwin':
+ try:
+ prefix = subprocess.check_output(['brew', '--prefix', 'flang'], text=True).strip()
+ cand = os.path.join(prefix, 'lib')
+ if os.path.isdir(cand):
+ candidates.append(cand)
+ except Exception:
+ pass
+ for cand in ('/opt/homebrew/opt/flang/lib', '/usr/local/opt/flang/lib'):
+ if os.path.isdir(cand):
+ candidates.append(cand)
+
+ # 6) Fallback common UNIX lib dirs
+ for cand in ('/usr/lib', '/usr/lib64', '/usr/local/lib', '/opt/local/lib'):
+ if os.path.isdir(cand):
+ candidates.append(cand)
+
+ # Validate candidates by presence of known Fortran runtime libs
+ def looks_valid(d):
+ probes = [
+ os.path.join(d, 'libFortranRuntime'),
+ os.path.join(d, 'libFortranDecimal'),
+ os.path.join(d, 'libflang_rt.runtime'),
+ os.path.join(d, 'libflang'),
+ ]
+ return _has_any(probes)
+
+ seen = set()
+ for d in candidates:
+ if not d or d in seen:
+ continue
+ seen.add(d)
+ if looks_valid(d):
+ return d
+ return None
+
+def _compute_flang_link_args(libdir):
+ """Return a list of extra link args appropriate for the platform and runtime present.
+
+ We prefer the new LLVM flang runtime (FortranRuntime/FortranDecimal). If not present,
+ fall back to classic flang libraries when detected. On macOS, add clang runtime only when needed.
+ """
+ args = []
+ def haslib(name):
+ if not libdir:
+ return False
+ return _has_any([os.path.join(libdir, name)])
+
+ if haslib('libFortranRuntime') and haslib('libFortranDecimal'):
+ args += ['-lFortranRuntime', '-lFortranDecimal']
+ elif haslib('libflang_rt.runtime') and haslib('libFortranDecimal'):
+ args += ['-lflang_rt.runtime', '-lFortranDecimal']
+ elif haslib('libflang'):
+ args += ['-lflang']
+ if haslib('libflangrti'):
+ args += ['-lflangrti']
+ else:
+ args += []
+
+ if sys.platform == 'darwin':
+ args += ['-lclang_rt.osx']
+ return args
+
+def _compute_openmp_link_args(compiler):
+ """Return OpenMP runtime link args based on the compiler suite.
+
+ - LLVMTOOLS -> libomp (and Homebrew paths on macOS)
+ - default (gfortran) -> libgomp
+ """
+ args = []
+ if compiler == "LLVMTOOLS":
+ # LLVM OpenMP
+ if sys.platform == 'darwin':
+ # Add Homebrew libomp search and rpath paths for both arm64 and x86_64
+ for p in ('/opt/homebrew/opt/libomp/lib', '/usr/local/opt/libomp/lib'):
+ args += ['-L'+p, '-Wl,-rpath,'+p]
+ args += ['-lomp']
+ else:
+ # GCC toolchain
+ args += ['-lgomp']
+ return args
+
def main():
import os
from sysconfig import get_config_var
mach = os.path.basename(os.getcwd())
Code = os.environ.get("CODE_EMBEDDED", None) # Code selection
Compiler = os.environ.get("COMPILER", None) # Compiler selection
- FortranLib = _detect_gfortran_dir() # directory with libfortran
+ # Directory containing Fortran runtime libraries
+ if Compiler == "LLVMTOOLS":
+ FortranLib = _detect_flang_dir()
+ else:
+ FortranLib = _detect_gfortran_dir()
HDF5Lib = os.environ.get("HDF5_API", None) # directory with libhdf5
pylib = os.path.basename(get_config_var("LIBDIR")) # get lib or lib64
print("install Cle2000 binding to", Code, "on directory",mach, "pylib=",pylib, "Compiler=",Compiler)
@@ -45,7 +194,7 @@ def main():
libTri="../../../Trivac/lib/"+mach+"_llvm"
libDra="../../../Dragon/lib/"+mach+"_llvm"
libDon="../../../Donjon/lib/"+mach+"_llvm"
- extralink=["-lFortranRuntime", "-lFortranDecimal", "-lclang_rt.osx"]
+ extralink=_compute_flang_link_args(FortranLib)
elif Compiler == "INTELTOOLS":
libdir="../../lib/"+mach+"_intel"
libUtl="../../../Utilib/lib/"+mach+"_intel"
@@ -133,7 +282,7 @@ def main():
author_email="alain.hebert@polymtl.ca",
license="LGPL",
ext_modules=[Extension('cle2000',sources=['cle2000module.c'],
- extra_link_args = ["-lgomp"]+extralink,
+ extra_link_args = _compute_openmp_link_args(Compiler)+extralink,
include_dirs=["../../../Ganlib/src"],
library_dirs=_dirs(libdir,FortranLib,HDF5Lib),
runtime_library_dirs=_dirs(FortranLib,HDF5Lib),
@@ -147,7 +296,7 @@ def main():
license="LGPL",
ext_modules=[Extension('cle2000',sources=['cle2000module.c'],
define_macros=[('__trivac__', None)],
- extra_link_args = ["-lgomp"]+extralink,
+ extra_link_args = _compute_openmp_link_args(Compiler)+extralink,
include_dirs=["../../../Ganlib/src"],
library_dirs=_dirs(libdir,FortranLib,HDF5Lib,libUtl,libTri),
runtime_library_dirs=_dirs(FortranLib,HDF5Lib),
@@ -161,7 +310,7 @@ def main():
license="LGPL",
ext_modules=[Extension('cle2000',sources=['cle2000module.c'],
define_macros=[('__dragon__', None)],
- extra_link_args = ["-lgomp"]+extralink,
+ extra_link_args = _compute_openmp_link_args(Compiler)+extralink,
include_dirs=["../../../Ganlib/src"],
library_dirs=_dirs(libdir,FortranLib,HDF5Lib,libUtl,libTri,libDra),
runtime_library_dirs=_dirs(FortranLib,HDF5Lib),
@@ -175,7 +324,7 @@ def main():
license="LGPL",
ext_modules=[Extension('cle2000',sources=['cle2000module.c'],
define_macros=[('__donjon__', None)],
- extra_link_args = ["-lgomp"]+extralink,
+ extra_link_args = _compute_openmp_link_args(Compiler)+extralink,
include_dirs=["../../../Ganlib/src"],
library_dirs=_dirs(libdir,FortranLib,HDF5Lib,libUtl,libTri,libDra,libDon),
runtime_library_dirs=_dirs(FortranLib,HDF5Lib),
diff --git a/Trivac/src/Makefile b/Trivac/src/Makefile
index 2ad728a..b05c9df 100644
--- a/Trivac/src/Makefile
+++ b/Trivac/src/Makefile
@@ -136,6 +136,9 @@ else
FFLAGS += -mmlir -fdynamic-heap-array
ifeq ($(OS),Darwin)
LFLAGS += -lclang_rt.osx
+ ifeq ($(openmp),1)
+ LFLAGS += -L/opt/homebrew/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp
+ endif
endif
else
lib = ../lib/$(DIRNAME)
diff --git a/Utilib/src/Makefile b/Utilib/src/Makefile
index e56d213..6993827 100644
--- a/Utilib/src/Makefile
+++ b/Utilib/src/Makefile
@@ -130,6 +130,9 @@ else
FFLAGS += -mmlir -fdynamic-heap-array
ifeq ($(OS),Darwin)
LFLAGS += -lclang_rt.osx
+ ifeq ($(openmp),1)
+ LFLAGS += -L/opt/homebrew/opt/libomp/lib -L/usr/local/opt/libomp/lib -lomp
+ endif
endif
else
lib = ../lib/$(DIRNAME)
generated by cgit v1.2.3 (git 2.46.0) at 2026-02-16 09:40:34 +0000