diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 1ceb304..d249edc 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -17,11 +17,9 @@ github_actions_labels: libboost_headers: - '1.88' libscotch: -- 7.0.10 +- 7.0.11 mkl_devel: -- '2024' -mumps_seq: -- 5.8.1 +- '2025' numpy: - '2' pin_run_as_build: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index dbc706c..ee330f8 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,11 +1,11 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.13' +- '11.0' MACOSX_SDK_VERSION: -- '10.13' +- '11.0' c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.13' +- '11.0' channel_sources: - conda-forge channel_targets: @@ -19,7 +19,7 @@ github_actions_labels: libboost_headers: - '1.88' libscotch: -- 7.0.10 +- 7.0.11 llvm_openmp: - '19' macos_machine: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 8414f2a..2e7494c 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -11,9 +11,7 @@ github_actions_labels: libboost_headers: - '1.88' mkl_devel: -- '2024' -mumps_seq: -- 5.8.1 +- '2025' numpy: - '2' pin_run_as_build: 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/azure-pipelines.yml b/azure-pipelines.yml index 1da6be1..03594e4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -7,7 +7,7 @@ stages: jobs: - job: Skip pool: - vmImage: 'ubuntu-22.04' + vmImage: 'ubuntu-latest' variables: DECODE_PERCENTS: 'false' RET: 'true' diff --git a/recipe/bld_core.bat b/recipe/bld_core.bat index ec5895d..2416251 100644 --- a/recipe/bld_core.bat +++ b/recipe/bld_core.bat @@ -7,7 +7,6 @@ cd cmakeBuild%PY_VER% cmake .. -G "Ninja" ^ -D CMAKE_BUILD_TYPE=Release ^ -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL="TRUE" ^ --D Muscat_ENABLE_Mumps:BOOL=ON ^ -D Muscat_ENABLE_Python:BOOL=ON ^ -D Muscat_ENABLE_Documentation=OFF ^ -D mmg_DIR:PATH=%PREFIX%/lib/cmake/mmg ^ diff --git a/recipe/build_core.sh b/recipe/build_core.sh index eda6b5c..b0e6d85 100644 --- a/recipe/build_core.sh +++ b/recipe/build_core.sh @@ -8,7 +8,6 @@ mkdir -p ${BUILD_DIR} cmake ${CMAKE_ARG} \ -D CMAKE_BUILD_TYPE=${BUILD_CONFIG} \ -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL="TRUE" \ --D Muscat_ENABLE_Mumps=ON \ -D Muscat_ENABLE_Python:BOOL=ON \ -D Muscat_ENABLE_Documentation=OFF \ -D mmg_DIR:PATH=${PREFIX}/lib/cmake/mmg \ diff --git a/recipe/build_core_OsX.sh b/recipe/build_core_OsX.sh index 326ac86..02080e5 100644 --- a/recipe/build_core_OsX.sh +++ b/recipe/build_core_OsX.sh @@ -8,7 +8,6 @@ mkdir -p ${BUILD_DIR} cmake ${CMAKE_ARG} \ -D CMAKE_BUILD_TYPE=${BUILD_CONFIG} \ -D CMAKE_EXPORT_COMPILE_COMMANDS:BOOL="TRUE" \ --D Muscat_ENABLE_Mumps=OFF \ -D Muscat_ENABLE_Python:BOOL=ON \ -D Muscat_ENABLE_Documentation=OFF \ -D mmg_DIR:PATH=${PREFIX}/lib/cmake/mmg \ @@ -28,7 +27,6 @@ cmake \ ctest \ --test-dir ${BUILD_DIR} \ --output-on-failure \ ---exclude-regex "NativeMumpsSolver|coverage" \ --parallel 16 cmake --install ${BUILD_DIR} diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9305271..175a473 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,7 +7,7 @@ package: source: url: https://gitlab.com/drti/muscat/-/archive/{{ version }}/muscat-{{ version }}.tar.bz2 - sha256: 60ce66aeabf8c71af1f3b39bc319cc853178c825a265c66e662bba671d3b202a + sha256: 1a97cb166959ef786469668b727c0c53ebfe115a466ca895440a1a189570187f build: number: 0 @@ -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 >=2.* - cython - sympy - #first version of eigency compatible with numpy 2 - eigency =3.4.0.4 - mkl-devel - setuptools-scm @@ -64,12 +61,12 @@ outputs: - 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 # [not osx] - h5py - matplotlib-base - pycgns-core - - mumps-seq # [not osx] - - mumps-include # [linux] + - python-mumps + - vcomp14 # [win] run: - python - {{ pin_compatible('numpy') }} @@ -82,14 +79,15 @@ 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 # [not osx] - h5py - matplotlib-base - pycgns-core - - mumps-seq # [not osx] + - python-mumps imports: - Muscat commands: @@ -102,8 +100,7 @@ outputs: requirements: host: - python - - numpy >=2.* # [py >= 313] - - numpy =1.* # [py < 313] + - numpy >=2.* - vtk <=9.4.2 - psutil - h5py @@ -120,9 +117,9 @@ outputs: - pyvista - networkx >=3.0 - mmgsuite =5.8 - - cvxpy # [not osx or py!=313 ] + - cvxpy # [not osx] - pycgns-core - - mumps-seq # [not osx] + - python-mumps test: imports: - psutil @@ -150,8 +147,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 +169,8 @@ outputs: - kokkos =4.4.01 h* # [not linux] - mmgsuite =5.8 - pycgns-core - - cvxpy # [not osx or py!=313 ] + - cvxpy # [not osx] + - python-mumps test: imports: - numpy