diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 1ceb304..c9ec322 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -19,7 +19,7 @@ libboost_headers: libscotch: - 7.0.10 mkl_devel: -- '2024' +- '2025' mumps_seq: - 5.8.1 numpy: diff --git a/.ci_support/migrations/mkl2025.yaml b/.ci_support/migrations/mkl2025.yaml new file mode 100644 index 0000000..90f5cf8 --- /dev/null +++ b/.ci_support/migrations/mkl2025.yaml @@ -0,0 +1,12 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for mkl 2025 + kind: version + migration_number: 1 +migrator_ts: 1731082955.2367358 +mkl: +- '2025' # [not osx] +- '2023' # [osx] +mkl_devel: +- '2025' # [not osx] +- '2023' # [osx] diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 8414f2a..6b261ba 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -11,7 +11,7 @@ github_actions_labels: libboost_headers: - '1.88' mkl_devel: -- '2024' +- '2025' mumps_seq: - 5.8.1 numpy: diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index e6b374e..df767d0 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9305271..c5ded3b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.5.1" %} +{% set version = "2.5.1.1" %} package: name: muscat-split @@ -7,10 +7,10 @@ package: source: url: https://gitlab.com/drti/muscat/-/archive/{{ version }}/muscat-{{ version }}.tar.bz2 - sha256: 60ce66aeabf8c71af1f3b39bc319cc853178c825a265c66e662bba671d3b202a + sha256: 1a97cb166959ef786469668b727c0c53ebfe115a466ca895440a1a189570187f build: - number: 0 + number: 1 outputs: @@ -37,12 +37,9 @@ outputs: host: - ninja - python - # for the moment numpy 2 is activated only for python 3.13 (numpy 1 not available on py 3.13) - - numpy >=2.* # [py >= 313] - - numpy =1.* # [py < 313] + - numpy - cython - sympy - #first version of eigency compatible with numpy 2 - eigency =3.4.0.4 - mkl-devel - setuptools-scm @@ -63,16 +60,15 @@ outputs: - dill - pywin32 - networkx >=3.0 - # cvxpy not available in osx for numpy 2 (numpy 1 not available on python 3.13) - - cvxpy # [not osx or py!=313 ] + - cvxpy - h5py - matplotlib-base - pycgns-core - mumps-seq # [not osx] - mumps-include # [linux] + - vcomp14 # [win] run: - python - - {{ pin_compatible('numpy') }} - scipy >=1.12 - sympy - eigency =3.4.0.4 @@ -82,10 +78,11 @@ outputs: - kokkos =4.7.01 h* # [linux] - kokkos =4.4.01 h* # [not linux] - mmgsuite =5.8 + - vcomp14 # [win] test: requires: - scipy - - cvxpy # [not osx or py!=313 ] + - cvxpy - h5py - matplotlib-base - pycgns-core @@ -93,6 +90,7 @@ outputs: imports: - Muscat commands: + - set OMP_NUM_THREADS=1 - python -u -m Muscat.Helpers.Check -k Which -k Mumps # [osx] - python -u -m Muscat.Helpers.Check # [linux] - python -u -m Muscat.Helpers.Check -k AnisotropicMetricComputation -k Mumps # [win] @@ -102,8 +100,7 @@ outputs: requirements: host: - python - - numpy >=2.* # [py >= 313] - - numpy =1.* # [py < 313] + - numpy >=2.* - vtk <=9.4.2 - psutil - h5py @@ -113,6 +110,7 @@ outputs: run: - python - {{ pin_compatible('numpy') }} + - {{ pin_compatible('hdf5') }} - vtk <=9.4.2 - psutil - h5py @@ -120,7 +118,7 @@ outputs: - pyvista - networkx >=3.0 - mmgsuite =5.8 - - cvxpy # [not osx or py!=313 ] + - cvxpy - pycgns-core - mumps-seq # [not osx] test: @@ -150,8 +148,7 @@ outputs: run: - {{ compiler('cxx') }} - python - - numpy >=2.* # [py >= 313] - - numpy =1.* # [py < 313] + - numpy >=2.* - sympy - cython - eigency =3.4.0.4 @@ -173,7 +170,7 @@ outputs: - kokkos =4.4.01 h* # [not linux] - mmgsuite =5.8 - pycgns-core - - cvxpy # [not osx or py!=313 ] + - cvxpy test: imports: - numpy