Skip to content

Rebuild for mkl 2025 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
regro-cf-autotick-bot wants to merge 11 commits into
base: main
Choose a base branch
from
+47 −19
Open

Rebuild for mkl 2025 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
989375d
Rebuild for mkl 2025
regro-cf-autotick-bot Dec 9, 2025
308f7f7
MNT: Re-rendered with conda-smithy 3.53.3 and conda-forge-pinning 202…
regro-cf-autotick-bot Dec 9, 2025
b316948
MNT: Re-rendered with conda-smithy 3.54.1 and conda-forge-pinning 202…
h-vetinari Dec 28, 2025
9097951
finish numpy 2.0 migration
h-vetinari Dec 28, 2025
fe8c0f1
avoid numpy 2.4 for now
h-vetinari Dec 28, 2025
7d9e59a
Update version to 2.5.1.1 in meta.yaml
Laureleen06 Feb 20, 2026
d354237
Add vcomp to dependencies in meta.yaml
Laureleen06 Feb 20, 2026
9db3feb
Update vcomp dependency for Windows
Laureleen06 Feb 20, 2026
febffe1
Update numpy version constraints and cvxpy comments
Laureleen06 Feb 20, 2026
577cacb
Set OMP_NUM_THREADS to 1 and pin hdf5 version
Laureleen06 Feb 20, 2026
af9867f
Remove OSX restriction for cvxpy dependency
Laureleen06 Feb 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ libboost_headers:
libscotch:
- 7.0.10
mkl_devel:
- '2024'
- '2025'
mumps_seq:
- 5.8.1
numpy:
Expand Down
12 changes: 12 additions & 0 deletions .ci_support/migrations/mkl2025.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]
2 changes: 1 addition & 1 deletion .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ github_actions_labels:
libboost_headers:
- '1.88'
mkl_devel:
- '2024'
- '2025'
mumps_seq:
- 5.8.1
numpy:
Expand Down
19 changes: 19 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 14 additions & 17 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "2.5.1" %}
{% set version = "2.5.1.1" %}

package:
name: muscat-split
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -82,17 +78,19 @@ 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
- mumps-seq # [not osx]
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]
Expand All @@ -102,8 +100,7 @@ outputs:
requirements:
host:
- python
- numpy >=2.* # [py >= 313]
- numpy =1.* # [py < 313]
- numpy >=2.*
- vtk <=9.4.2
- psutil
- h5py
Expand All @@ -113,14 +110,15 @@ outputs:
run:
- python
- {{ pin_compatible('numpy') }}
- {{ pin_compatible('hdf5') }}
- vtk <=9.4.2
- psutil
- h5py
- meshio
- pyvista
- networkx >=3.0
- mmgsuite =5.8
- cvxpy # [not osx or py!=313 ]
- cvxpy
- pycgns-core
- mumps-seq # [not osx]
test:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down