From 8f6768097340f8585fb56e9ced8b7fccdecc9d8b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 4 Nov 2024 18:27:52 +0100 Subject: [PATCH 01/13] Add fans to conda-forge --- recipes/fans/meta.yaml | 60 ++++++++++++++++++++++++++++++++++++++++ recipes/fans/run_test.sh | 17 ++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 recipes/fans/meta.yaml create mode 100644 recipes/fans/run_test.sh diff --git a/recipes/fans/meta.yaml b/recipes/fans/meta.yaml new file mode 100644 index 0000000000000..cddfbbde0c165 --- /dev/null +++ b/recipes/fans/meta.yaml @@ -0,0 +1,60 @@ +{% set name = "FANS" %} +{% set version = "0.3.0" %} + +package: + name: {{ name|lower }} + version: {{ version }} + +source: + url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v{{ version }.tar.gz + sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88 + +build: + skip: True # [win or osx] + number: 0 + script: + - rm -rf build + - mkdir build + - cd build + - cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_C_COMPILER=$PREFIX/bin/mpicc -DCMAKE_CXX_COMPILER=$PREFIX/bin/mpicxx + - cmake --build . -j + - cmake --install . --prefix $PREFIX + +requirements: + build: + - {{ compiler('cxx') }} + - {{ stdlib('c') }} + - cmake + host: + - hdf5 * mpi_openmpi* + - fftw * mpi_openmpi* + - openmpi-mpicxx + - eigen + run: + - hdf5 * mpi_openmpi* + - fftw * mpi_openmpi* + - openmpi-mpicxx + - eigen + +test: + requires: + - jq + source_files: + - test/input_files/test_LinearElastic.json + - test/microstructures/sphere32.h5 + +about: + home: https://github.com/DataAnalyticsEngineering/FANS + summary: "FANS: an open-source, efficient, and parallel FFT-based homogenization solver designed to solve microscale multiphysics problems." + description: | + Fourier Accelerated Nodal Solvers (FANS) is an FFT-based homogenization solver designed to handle microscale multiphysics problems. | + This repository contains a C++ implementation of FANS, built using CMake and MPI for parallel computations. + license: LGPL-3.0-only + license_family: LGPL + license_file: LICENSE + +extra: + recipe-maintainers: + - sanathkeshav + - claudiushaag + - EMMAOpenSource diff --git a/recipes/fans/run_test.sh b/recipes/fans/run_test.sh new file mode 100644 index 0000000000000..e6b25bbac6aaf --- /dev/null +++ b/recipes/fans/run_test.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Define the path to the original JSON file +JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic.json" + +# Define the path for the modified JSON file +MODIFIED_JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic_mod.json" + +# Set the new value for ms_filename +NEW_MS_FILENAME="$SRC_DIR/test/microstructures/sphere32.h5" + +# Use jq to create a modified copy of the JSON file +jq --arg new_filename "$NEW_MS_FILENAME" '.ms_filename = $new_filename' "$JSON_FILE" > "$MODIFIED_JSON_FILE" + + +# Run tests +mpiexec -n 2 FANS "$MODIFIED_JSON_FILE" $SRC_DIR/test/test_results.h5 \ No newline at end of file From e56b898869a7e2af5148a018608ad8cc4141d71b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 4 Nov 2024 18:40:10 +0100 Subject: [PATCH 02/13] Add missing bracket --- recipes/fans/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/fans/meta.yaml b/recipes/fans/meta.yaml index cddfbbde0c165..10b6c3405ce28 100644 --- a/recipes/fans/meta.yaml +++ b/recipes/fans/meta.yaml @@ -6,7 +6,7 @@ package: version: {{ version }} source: - url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v{{ version }.tar.gz + url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v{{ version }}.tar.gz sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88 build: From 81b46b9097c2743e200eaaa5ed4372a191ec02c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 4 Nov 2024 18:43:27 +0100 Subject: [PATCH 03/13] Rewrite license --- recipes/fans/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/fans/meta.yaml b/recipes/fans/meta.yaml index 10b6c3405ce28..57c56ba5193e9 100644 --- a/recipes/fans/meta.yaml +++ b/recipes/fans/meta.yaml @@ -47,9 +47,9 @@ about: home: https://github.com/DataAnalyticsEngineering/FANS summary: "FANS: an open-source, efficient, and parallel FFT-based homogenization solver designed to solve microscale multiphysics problems." description: | - Fourier Accelerated Nodal Solvers (FANS) is an FFT-based homogenization solver designed to handle microscale multiphysics problems. | + Fourier Accelerated Nodal Solvers (FANS) is an FFT-based homogenization solver designed to handle microscale multiphysics problems. This repository contains a C++ implementation of FANS, built using CMake and MPI for parallel computations. - license: LGPL-3.0-only + license: LGPL-3.0-only license_family: LGPL license_file: LICENSE From a5457bb7bba71a08edc87ede7834ec37267ffdfd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 5 Nov 2024 09:09:23 +0100 Subject: [PATCH 04/13] Fix selectors --- recipes/fans/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/fans/meta.yaml b/recipes/fans/meta.yaml index 57c56ba5193e9..731c6a936cd0f 100644 --- a/recipes/fans/meta.yaml +++ b/recipes/fans/meta.yaml @@ -10,7 +10,7 @@ source: sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88 build: - skip: True # [win or osx] + skip: True # [win or osx] number: 0 script: - rm -rf build From d6ee7c8c410ddcfd7b0a10dece71d699d16343bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 5 Nov 2024 15:59:57 +0100 Subject: [PATCH 05/13] Switch to rattler build to circumvent #11612 of conda/conda. Current local problem: no stdlib found for language c, even though variant_configuration is provided... --- recipes/fans/{meta.yaml => recipe.yaml} | 54 +++++++++++++++---------- recipes/fans/variant_configuration.yaml | 11 +++++ 2 files changed, 44 insertions(+), 21 deletions(-) rename recipes/fans/{meta.yaml => recipe.yaml} (50%) create mode 100644 recipes/fans/variant_configuration.yaml diff --git a/recipes/fans/meta.yaml b/recipes/fans/recipe.yaml similarity index 50% rename from recipes/fans/meta.yaml rename to recipes/fans/recipe.yaml index 731c6a936cd0f..181293ffb6ee3 100644 --- a/recipes/fans/meta.yaml +++ b/recipes/fans/recipe.yaml @@ -1,30 +1,34 @@ -{% set name = "FANS" %} -{% set version = "0.3.0" %} +context: + version: "0.3.0" package: - name: {{ name|lower }} - version: {{ version }} + name: fans + version: ${{version}} source: - url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v{{ version }}.tar.gz + url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v${{version}}.tar.gz sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88 build: - skip: True # [win or osx] number: 0 script: - - rm -rf build - - mkdir build - - cd build - - cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_C_COMPILER=$PREFIX/bin/mpicc -DCMAKE_CXX_COMPILER=$PREFIX/bin/mpicxx - - cmake --build . -j - - cmake --install . --prefix $PREFIX + - if: linux + then: + - rm -rf build + - mkdir build + - cd build + - cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_C_COMPILER=$PREFIX/bin/mpicc -DCMAKE_CXX_COMPILER=$PREFIX/bin/mpicxx + - cmake --build . -j + - cmake --install . --prefix $PREFIX requirements: build: - - {{ compiler('cxx') }} - - {{ stdlib('c') }} + - ${{ compiler('c') }} + - ${{ compiler('cxx') }} + # Commented out temporarily, because rattler-build does not find the stdlib + # - ${{ stdlib('c') }} # If you need any compiler, add the C standard library ("stdlib") too - cmake + - ninja host: - hdf5 * mpi_openmpi* - fftw * mpi_openmpi* @@ -36,15 +40,23 @@ requirements: - openmpi-mpicxx - eigen -test: - requires: - - jq - source_files: - - test/input_files/test_LinearElastic.json - - test/microstructures/sphere32.h5 +tests: + - package_contents: + bin: + - FANS + - script: + - echo "Hello World!" + - ./run_test.sh + - requirements: + run: + - jq + - files: + source: + - test/input_files/test_LinearElastic.json + - test/microstructures/sphere32.h5 about: - home: https://github.com/DataAnalyticsEngineering/FANS + repository: https://github.com/DataAnalyticsEngineering/FANS summary: "FANS: an open-source, efficient, and parallel FFT-based homogenization solver designed to solve microscale multiphysics problems." description: | Fourier Accelerated Nodal Solvers (FANS) is an FFT-based homogenization solver designed to handle microscale multiphysics problems. diff --git a/recipes/fans/variant_configuration.yaml b/recipes/fans/variant_configuration.yaml new file mode 100644 index 0000000000000..d77710847c85a --- /dev/null +++ b/recipes/fans/variant_configuration.yaml @@ -0,0 +1,11 @@ +# these are the values `conda-forge` uses in their pinning file + +# found at https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml + +c_stdlib: + +- sysroot + +c_stdlib_version: + +- 2.17 \ No newline at end of file From 6cecb9645490447b56790ccd4905acffcd565360 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Nov 2024 09:37:18 +0100 Subject: [PATCH 06/13] Adding the standardlib, as requested. + Fix remaining lints --- recipes/fans/recipe.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index 181293ffb6ee3..c5313d11087bb 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -3,10 +3,10 @@ context: package: name: fans - version: ${{version}} + version: ${{ version }} source: - url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v${{version}}.tar.gz + url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v${{ version }}.tar.gz sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88 build: @@ -25,8 +25,7 @@ requirements: build: - ${{ compiler('c') }} - ${{ compiler('cxx') }} - # Commented out temporarily, because rattler-build does not find the stdlib - # - ${{ stdlib('c') }} # If you need any compiler, add the C standard library ("stdlib") too + - ${{ stdlib('c') }} # If you need any compiler, add the C standard library ("stdlib") too - cmake - ninja host: @@ -56,7 +55,7 @@ tests: - test/microstructures/sphere32.h5 about: - repository: https://github.com/DataAnalyticsEngineering/FANS + homepage: https://github.com/DataAnalyticsEngineering/FANS summary: "FANS: an open-source, efficient, and parallel FFT-based homogenization solver designed to solve microscale multiphysics problems." description: | Fourier Accelerated Nodal Solvers (FANS) is an FFT-based homogenization solver designed to handle microscale multiphysics problems. From e90bfc29b978670a8f67e78080bc55f7bcf721bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Nov 2024 09:39:03 +0100 Subject: [PATCH 07/13] Add explicit skips --- recipes/fans/recipe.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index c5313d11087bb..42053f9441dab 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -11,6 +11,9 @@ source: build: number: 0 + skip: + - win + - osx script: - if: linux then: From 82120ead78cb17793db82219355203481644e8d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Nov 2024 09:48:49 +0100 Subject: [PATCH 08/13] Add make under build requirements --- recipes/fans/recipe.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index 42053f9441dab..3807d24645302 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -30,6 +30,7 @@ requirements: - ${{ compiler('cxx') }} - ${{ stdlib('c') }} # If you need any compiler, add the C standard library ("stdlib") too - cmake + - make - ninja host: - hdf5 * mpi_openmpi* From 16f48851de21e0ab6ac64f053ac40a7ac0170110 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Nov 2024 12:45:47 +0100 Subject: [PATCH 09/13] Include tests in script part --- recipes/fans/recipe.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index 3807d24645302..c053c65ef2e69 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -49,7 +49,16 @@ tests: - FANS - script: - echo "Hello World!" - - ./run_test.sh + # Define the path to the original JSON file + - JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic.json" + # Define the path for the modified JSON file + - MODIFIED_JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic_mod.json" + # Set the new value for ms_filename + - NEW_MS_FILENAME="$SRC_DIR/test/microstructures/sphere32.h5" + # Use jq to create a modified copy of the JSON file + - jq --arg new_filename "$NEW_MS_FILENAME" '.ms_filename = $new_filename' "$JSON_FILE" > "$MODIFIED_JSON_FILE" + # Run tests + - mpiexec -n 2 FANS "$MODIFIED_JSON_FILE" $SRC_DIR/test/test_results.h5 - requirements: run: - jq From 3b066246588ab9e9de5eec9cba4e17439e9f184d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 6 Nov 2024 15:58:35 +0100 Subject: [PATCH 10/13] Remove application test + because rattler-build does not copy h5? + delete other not needed files --- recipes/fans/recipe.yaml | 19 ------------------- recipes/fans/run_test.sh | 17 ----------------- recipes/fans/variant_configuration.yaml | 11 ----------- 3 files changed, 47 deletions(-) delete mode 100644 recipes/fans/run_test.sh delete mode 100644 recipes/fans/variant_configuration.yaml diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index c053c65ef2e69..62e337abe0a2a 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -47,25 +47,6 @@ tests: - package_contents: bin: - FANS - - script: - - echo "Hello World!" - # Define the path to the original JSON file - - JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic.json" - # Define the path for the modified JSON file - - MODIFIED_JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic_mod.json" - # Set the new value for ms_filename - - NEW_MS_FILENAME="$SRC_DIR/test/microstructures/sphere32.h5" - # Use jq to create a modified copy of the JSON file - - jq --arg new_filename "$NEW_MS_FILENAME" '.ms_filename = $new_filename' "$JSON_FILE" > "$MODIFIED_JSON_FILE" - # Run tests - - mpiexec -n 2 FANS "$MODIFIED_JSON_FILE" $SRC_DIR/test/test_results.h5 - - requirements: - run: - - jq - - files: - source: - - test/input_files/test_LinearElastic.json - - test/microstructures/sphere32.h5 about: homepage: https://github.com/DataAnalyticsEngineering/FANS diff --git a/recipes/fans/run_test.sh b/recipes/fans/run_test.sh deleted file mode 100644 index e6b25bbac6aaf..0000000000000 --- a/recipes/fans/run_test.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# Define the path to the original JSON file -JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic.json" - -# Define the path for the modified JSON file -MODIFIED_JSON_FILE="$SRC_DIR/test/input_files/test_LinearElastic_mod.json" - -# Set the new value for ms_filename -NEW_MS_FILENAME="$SRC_DIR/test/microstructures/sphere32.h5" - -# Use jq to create a modified copy of the JSON file -jq --arg new_filename "$NEW_MS_FILENAME" '.ms_filename = $new_filename' "$JSON_FILE" > "$MODIFIED_JSON_FILE" - - -# Run tests -mpiexec -n 2 FANS "$MODIFIED_JSON_FILE" $SRC_DIR/test/test_results.h5 \ No newline at end of file diff --git a/recipes/fans/variant_configuration.yaml b/recipes/fans/variant_configuration.yaml deleted file mode 100644 index d77710847c85a..0000000000000 --- a/recipes/fans/variant_configuration.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# these are the values `conda-forge` uses in their pinning file - -# found at https://github.com/conda-forge/conda-forge-pinning-feedstock/blob/main/recipe/conda_build_config.yaml - -c_stdlib: - -- sysroot - -c_stdlib_version: - -- 2.17 \ No newline at end of file From 1f9655d536a12e09f980b3d2b0f837ffcfd9679a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 12 Nov 2024 00:16:42 +0100 Subject: [PATCH 11/13] Remove redundant run requirements + add real tests + but download h5 file from git directly, as rattler-build does not copy it....? --- recipes/fans/recipe.yaml | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index 62e337abe0a2a..61bb92e58163d 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -37,16 +37,27 @@ requirements: - fftw * mpi_openmpi* - openmpi-mpicxx - eigen - run: - - hdf5 * mpi_openmpi* - - fftw * mpi_openmpi* - - openmpi-mpicxx - - eigen tests: - package_contents: bin: - FANS + - script: + - mkdir -p $(dirname "$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5") && curl -L -o "$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5" https://raw.githubusercontent.com/DataAnalyticsEngineering/FANS/main/test/microstructures/sphere32.h5 + - echo "Download of missing file complete!" + - JSON_FILE="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/input_files/test_LinearElastic.json" + - MODIFIED_JSON_FILE="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/input_files/test_LinearElastic_mod.json" + - NEW_MS_FILENAME="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5" + # Use jq to create a modified copy of the JSON file + - jq --arg new_filename "$NEW_MS_FILENAME" '.ms_filename = $new_filename' "$JSON_FILE" > "$MODIFIED_JSON_FILE" + # Run tests + - mpiexec -n 2 FANS "$MODIFIED_JSON_FILE" "$PREFIX/etc/conda/test-files/$PKG_NAME/0//test/test_results.h5" + requirements: + run: + - jq + files: + source: + - test/ about: homepage: https://github.com/DataAnalyticsEngineering/FANS From d381221781cd16b8fcca0e94acf718a584033b92 Mon Sep 17 00:00:00 2001 From: Claudius Haag Date: Thu, 28 Nov 2024 11:11:33 +0100 Subject: [PATCH 12/13] Remove workaround for rattler-build gitignore thing + add patch for FANS shortcoming --- recipes/fans/fix_gitignore_ms.patch | 25 +++++++++++++++++++++++++ recipes/fans/recipe.yaml | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 recipes/fans/fix_gitignore_ms.patch diff --git a/recipes/fans/fix_gitignore_ms.patch b/recipes/fans/fix_gitignore_ms.patch new file mode 100644 index 0000000000000..208a0637307d4 --- /dev/null +++ b/recipes/fans/fix_gitignore_ms.patch @@ -0,0 +1,25 @@ +From 393a0c622bcef196bbe1c0cc81fe8c15b9b152c4 Mon Sep 17 00:00:00 2001 +From: Claudius Haag +Date: Thu, 28 Nov 2024 11:04:56 +0100 +Subject: [PATCH] Fix gitignore for sphere32 inclusion + needed for copying + when doing test for conda-forge packaging + +--- + .gitignore | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.gitignore b/.gitignore +index 2bc948f..c713336 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -198,7 +198,7 @@ test/input_files/**/*.json + **/scratch/ + + # Test microstructure files +-!sphere.h5 ++!sphere32.h5 + + # Test input files + !test_LinearElastic.json +-- +2.34.1 diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index 61bb92e58163d..969f68b7feb2a 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -8,6 +8,8 @@ package: source: url: https://github.com/DataAnalyticsEngineering/FANS/archive/refs/tags/v${{ version }}.tar.gz sha256: 1573478d9acd27a9cfc126a4167ce3951ec26e9896bf19577b44cbc4bdc48b88 + patches: + - fix_gitignore_ms.patch # modify so gitignore does not include the sphere32.h5 file build: number: 0 @@ -43,8 +45,6 @@ tests: bin: - FANS - script: - - mkdir -p $(dirname "$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5") && curl -L -o "$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5" https://raw.githubusercontent.com/DataAnalyticsEngineering/FANS/main/test/microstructures/sphere32.h5 - - echo "Download of missing file complete!" - JSON_FILE="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/input_files/test_LinearElastic.json" - MODIFIED_JSON_FILE="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/input_files/test_LinearElastic_mod.json" - NEW_MS_FILENAME="$PREFIX/etc/conda/test-files/$PKG_NAME/0/test/microstructures/sphere32.h5" From b9419c2fbba7e17901529745879ae578787f8299 Mon Sep 17 00:00:00 2001 From: Claudius Haag Date: Thu, 12 Dec 2024 11:21:03 +0100 Subject: [PATCH 13/13] Add review changes --- recipes/fans/recipe.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/fans/recipe.yaml b/recipes/fans/recipe.yaml index 969f68b7feb2a..78ad444a09cb9 100644 --- a/recipes/fans/recipe.yaml +++ b/recipes/fans/recipe.yaml @@ -22,15 +22,15 @@ build: - rm -rf build - mkdir build - cd build - - cmake .. -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_C_COMPILER=$PREFIX/bin/mpicc -DCMAKE_CXX_COMPILER=$PREFIX/bin/mpicxx + - cmake .. $CMAKE_ARGS -DCMAKE_C_COMPILER=$PREFIX/bin/mpicc -DCMAKE_CXX_COMPILER=$PREFIX/bin/mpicxx - cmake --build . -j - - cmake --install . --prefix $PREFIX + - cmake --install . requirements: build: - ${{ compiler('c') }} - ${{ compiler('cxx') }} - - ${{ stdlib('c') }} # If you need any compiler, add the C standard library ("stdlib") too + - ${{ stdlib('c') }} - cmake - make - ninja