From 51ef1aa5652ed8825a2ea1f10cbee6594f7ad000 Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Wed, 22 Feb 2023 08:46:33 -0800 Subject: [PATCH 01/18] update version mpp --- meson_scripts/init.py | 2 +- subprojects/Mutationpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson_scripts/init.py b/meson_scripts/init.py index a5e024a1b20..b680c4465cc 100755 --- a/meson_scripts/init.py +++ b/meson_scripts/init.py @@ -54,7 +54,7 @@ def init_submodules(method = 'auto'): github_repo_meson = 'https://github.com/mesonbuild/meson' sha_version_ninja = '52649de2c56b63f42bc59513d51286531c595b44' github_repo_ninja = 'https://github.com/ninja-build/ninja' - sha_version_mpp = '5ff579f43781cae07411e5ab46291c9971536be6' + sha_version_mpp = '4cb6e3a05c15f49ffd346dc9f185ccc3459728b0' github_repo_mpp = 'https://github.com/mutationpp/Mutationpp' sha_version_coolprop = '0ce42fcf3bb2c373512bc825a4f0c1973a78f307' github_repo_coolprop = 'https://github.com/CoolProp/CoolProp' diff --git a/subprojects/Mutationpp b/subprojects/Mutationpp index 5ff579f4378..4cb6e3a05c1 160000 --- a/subprojects/Mutationpp +++ b/subprojects/Mutationpp @@ -1 +1 @@ -Subproject commit 5ff579f43781cae07411e5ab46291c9971536be6 +Subproject commit 4cb6e3a05c15f49ffd346dc9f185ccc3459728b0 From 0adc5c517c5e5fe78b4b36fff5c301e02335d0cf Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Wed, 22 Feb 2023 13:25:26 -0500 Subject: [PATCH 02/18] remove block on gupta yos --- Common/src/CConfig.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 8b36a1f2415..918ac0bfe26 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -3942,9 +3942,8 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i } } - if (Kind_FluidModel == MUTATIONPP && - (Kind_TransCoeffModel != TRANSCOEFFMODEL::WILKE && Kind_TransCoeffModel != TRANSCOEFFMODEL::CHAPMANN_ENSKOG)) { - SU2_MPI::Error("Transport model not available for NEMO solver using MUTATIONPP. Please use the WILKE or CHAPMANN_ENSKOG transport model instead..", + if (Kind_FluidModel == MUTATIONPP && (Kind_TransCoeffModel == TRANSCOEFFMODEL::SUTHERLAND)) { + SU2_MPI::Error("Transport model not available for NEMO solver using MUTATIONPP. Please use the WILKE, GUPTAYOS, or CHAPMANN_ENSKOG transport model instead.", CURRENT_FUNCTION); } From 1f9d2c7890d1e99bc48ce646c05d24f27726b125 Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Wed, 22 Feb 2023 14:40:03 -0500 Subject: [PATCH 03/18] Try to get mutation++ to compile --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index e749e661e70..a17a697790a 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -26,7 +26,7 @@ jobs: config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP] include: - config_set: BaseMPI - flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-tests=true --warnlevel=2 --werror' + flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Denable-tests=true --warnlevel=2 --werror' - config_set: ReverseMPI flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror' - config_set: ForwardMPI From 26f7dd5230539eff6baa150cc2b7d83cf19376be Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Thu, 23 Feb 2023 10:21:22 -0500 Subject: [PATCH 04/18] ?? --- meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meson.build b/meson.build index 84999a5476b..a6616202bce 100644 --- a/meson.build +++ b/meson.build @@ -230,6 +230,12 @@ catch2_dep = declare_dependency(include_directories: 'externals/catch2/') if get_option('enable-mpp') cmake = import('cmake') + if build_machine.cpu_family() == 'x86' or build_machine.cpu_family() == 'x86_64' + cmake_opts = cmake.subproject_options() + cmake_opts.add_cmake_defines({ + 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', + 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' + }) mpp_subproj = cmake.subproject('Mutationpp') mpp_dep = mpp_subproj.dependency('mutation++') su2_deps += mpp_dep From dbb78646a48f4e3fa55230361ef82fa913fced26 Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Thu, 23 Feb 2023 10:27:19 -0500 Subject: [PATCH 05/18] missing endif --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index a6616202bce..af4d79a063d 100644 --- a/meson.build +++ b/meson.build @@ -235,7 +235,8 @@ if get_option('enable-mpp') cmake_opts.add_cmake_defines({ 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' - }) + }) + endif mpp_subproj = cmake.subproject('Mutationpp') mpp_dep = mpp_subproj.dependency('mutation++') su2_deps += mpp_dep From c48a1e1b57fbc2969cc459b318ff92f6ee7d6c62 Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Thu, 23 Feb 2023 10:33:18 -0500 Subject: [PATCH 06/18] move if statement --- meson.build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index af4d79a063d..5fa6ca10e94 100644 --- a/meson.build +++ b/meson.build @@ -229,13 +229,13 @@ endforeach catch2_dep = declare_dependency(include_directories: 'externals/catch2/') if get_option('enable-mpp') - cmake = import('cmake') if build_machine.cpu_family() == 'x86' or build_machine.cpu_family() == 'x86_64' + cmake = import('cmake') cmake_opts = cmake.subproject_options() - cmake_opts.add_cmake_defines({ - 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', - 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' - }) + cmake_opts.add_cmake_defines({ + 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', + 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' + }) endif mpp_subproj = cmake.subproject('Mutationpp') mpp_dep = mpp_subproj.dependency('mutation++') From 7a342f1d37f527175f2e334b6a5a47c1906fcc03 Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Thu, 23 Feb 2023 08:17:41 -0800 Subject: [PATCH 07/18] Update meson.build --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5fa6ca10e94..a845d412781 100644 --- a/meson.build +++ b/meson.build @@ -237,7 +237,7 @@ if get_option('enable-mpp') 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' }) endif - mpp_subproj = cmake.subproject('Mutationpp') + mpp_subproj = cmake.subproject('Mutationpp', options: cmake_opts) mpp_dep = mpp_subproj.dependency('mutation++') su2_deps += mpp_dep su2_cpp_args += '-DHAVE_MPP' From e31676cf0d9ecf208d0702af743f80866ef0d0bb Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Thu, 23 Feb 2023 11:43:58 -0500 Subject: [PATCH 08/18] add error override --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index a845d412781..5d3374f25b2 100644 --- a/meson.build +++ b/meson.build @@ -232,6 +232,7 @@ if get_option('enable-mpp') if build_machine.cpu_family() == 'x86' or build_machine.cpu_family() == 'x86_64' cmake = import('cmake') cmake_opts = cmake.subproject_options() + cmake_opts.set_override_option('warning_level', '0') cmake_opts.add_cmake_defines({ 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' From 3362bc14a9be007932a212ad1a95147aa238ffbb Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Fri, 24 Feb 2023 15:38:50 -0800 Subject: [PATCH 09/18] Update .github/workflows/regression.yml --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index a17a697790a..8dea4730c10 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -26,7 +26,7 @@ jobs: config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP] include: - config_set: BaseMPI - flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Denable-tests=true --warnlevel=2 --werror' + flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Denable-tests=true --warnlevel=2' - config_set: ReverseMPI flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror' - config_set: ForwardMPI From ef77c7b7c60534a4439a8b7703056c2cce8c11bb Mon Sep 17 00:00:00 2001 From: WallyMaier Date: Mon, 27 Feb 2023 10:55:23 -0500 Subject: [PATCH 10/18] update docker date-time --- .github/workflows/regression.yml | 18 +++++++++--------- .github/workflows/release-management.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 8dea4730c10..ef4925a9a0c 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -52,12 +52,12 @@ jobs: key: ${{ matrix.config_set }}-${{ github.sha }} restore-keys: ${{ matrix.config_set }} - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/build-su2:230227-1421 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} - name: Build - uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/build-su2:230227-1421 with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries @@ -68,7 +68,7 @@ jobs: name: ${{ matrix.config_set }} path: install_bin.tgz - name: Post Cleanup - uses: docker://ghcr.io/su2code/su2/build-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/build-su2:230227-1421 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -99,7 +99,7 @@ jobs: tag: OMP steps: - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/test-su2:230227-1421 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -125,12 +125,12 @@ jobs: chmod a+x $BIN_FOLDER/* ls -lahR $BIN_FOLDER - name: Run Tests in Container - uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/test-su2:230227-1421 with: # -t -c args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} - name: Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/test-su2:230227-1421 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -151,7 +151,7 @@ jobs: tag: MPI steps: - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/test-su2:230227-1421 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -212,11 +212,11 @@ jobs: echo $PWD ls -lahR - name: Run Unit Tests - uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/test-su2:230227-1421 with: entrypoint: install/bin/${{matrix.testdriver}} - name: Post Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:221224-1158 + uses: docker://ghcr.io/su2code/su2/test-su2:230227-1421 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} diff --git a/.github/workflows/release-management.yml b/.github/workflows/release-management.yml index 287ecdb517d..0535e2f8a89 100644 --- a/.github/workflows/release-management.yml +++ b/.github/workflows/release-management.yml @@ -35,7 +35,7 @@ jobs: key: ${{ matrix.os_bin }}-${{ github.sha }} restore-keys: ${{ matrix.os_bin }} - name: Build - uses: docker://ghcr.io/su2code/su2/build-su2-cross:221224-1158 + uses: docker://ghcr.io/su2code/su2/build-su2-cross:230227-1421 with: args: -b ${{ github.sha }} -f "${{matrix.flags}}" - name: Create Archive From be559bc3a9863c63f5ccc94c74027346c21661d6 Mon Sep 17 00:00:00 2001 From: Pedro Gomes <38071223+pcarruscag@users.noreply.github.com> Date: Mon, 7 Aug 2023 08:26:20 -0700 Subject: [PATCH 11/18] Update .github/workflows/regression.yml --- .github/workflows/regression.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 1b49b9a4e14..61b61dd42a0 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -26,7 +26,7 @@ jobs: config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP] include: - config_set: BaseMPI - flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2 --werror' + flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2' - config_set: ReverseMPI flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror' - config_set: ForwardMPI From 3e30b1ca2bd103729fd312c12047e47d06b5b4d4 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Mon, 7 Aug 2023 18:58:08 -0700 Subject: [PATCH 12/18] try to make mutation accesible in test scripts --- .github/workflows/regression.yml | 2 +- TestCases/parallel_regression.py | 4 ++++ meson.build | 27 +++++++++++++++++++++------ meson_options.txt | 1 + 4 files changed, 27 insertions(+), 7 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 61b61dd42a0..81b8750d8ea 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -26,7 +26,7 @@ jobs: config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, BaseOMP, ReverseOMP, ForwardOMP] include: - config_set: BaseMPI - flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2' + flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2' - config_set: ReverseMPI flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror' - config_set: ForwardMPI diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 81ed8e4f1c5..658eee5fe53 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -29,9 +29,13 @@ from __future__ import print_function import sys +import os from TestCase import TestCase def main(): + os.environ['MPP_DATA_DIRECTORY'] = os.environ['SU2_RUN'] + "../mpp-data" + os.environ['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] + ":" + os.environ['SU2_RUN'] + "../lib" + '''This program runs SU2 and ensures that the output matches specified values. This will be used to do checks when code is pushed to github to make sure nothing is broken. ''' diff --git a/meson.build b/meson.build index 974d166faf4..d42e96818fa 100644 --- a/meson.build +++ b/meson.build @@ -238,14 +238,20 @@ if get_option('enable-mpp') cmake_opts = cmake.subproject_options() cmake_opts.set_override_option('warning_level', '0') cmake_opts.add_cmake_defines({ - 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', - 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' + 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', + 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' }) + cmake_opts.set_install(get_option('install-mpp')) endif mpp_subproj = cmake.subproject('Mutationpp', options: cmake_opts) mpp_dep = mpp_subproj.dependency('mutation++') su2_deps += mpp_dep su2_cpp_args += '-DHAVE_MPP' + + if get_option('install-mpp') + run_command('cp', '-r', join_paths(meson.source_root(), '/subprojects/Mutationpp/data'), + join_paths(get_option('prefix'), '/mpp-data'), check: true) + endif endif if get_option('enable-coolprop') @@ -340,12 +346,21 @@ message('''--------------------------------------------------------------------- get_option('enable-mlpcpp'), meson.project_build_root().startswith(meson.project_source_root()) ? meson.project_build_root().split('/')[-1] : meson.project_build_root())) if get_option('enable-mpp') - message(''' To run SU2 with Mutation++ library, add these lines to your .bashrc file: + if get_option('install-mpp') + message(''' To run SU2 with Mutation++ library, add these lines to your .bashrc file: - export MPP_DATA_DIRECTORY=$SU2_HOME/subprojects/Mutationpp/data - export LD_LIBRARY_PATH=$SU2_HOME//subprojects/Mutationpp + export MPP_DATA_DIRECTORY=$SU2_RUN/../mpp-data + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SU2_RUN/../lib - ''') + ''') + else + message(''' To run SU2 with Mutation++ library, add these lines to your .bashrc file: + + export MPP_DATA_DIRECTORY=$SU2_HOME/subprojects/Mutationpp/data + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SU2_HOME//subprojects/Mutationpp + + ''') + endif endif if get_option('enable-librom') diff --git a/meson_options.txt b/meson_options.txt index f31f9a0fc57..c3886bd037e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -18,6 +18,7 @@ option('enable-tests', type : 'boolean', value : false, description: 'compile U option('enable-mixedprec', type : 'boolean', value : false, description: 'use single precision floating point arithmetic for sparse algebra') option('extra-deps', type : 'string', value : '', description: 'comma-separated list of extra (custom) dependencies to add for compilation') option('enable-mpp', type : 'boolean', value : false, description: 'enable Mutation++ support') +option('install-mpp', type : 'boolean', value : false, description: 'install Mutation++ in the directory defined with --prefix') option('enable-coolprop', type : 'boolean', value : false, description: 'enable CoolProp support') option('enable-mlpcpp', type : 'boolean', value : false, description: 'enable MLPCpp support') option('opdi-backend', type : 'combo', choices : ['auto', 'macro', 'ompt'], value : 'auto', description: 'OpDiLib backend choice') From dc55d1ed2cc02935ee751758524d5c6b2b2d12ae Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 12 Aug 2023 16:08:01 -0700 Subject: [PATCH 13/18] use python to copy mutation data --- SU2_PY/copy_directory.py | 11 +++++++++++ meson.build | 11 +++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100755 SU2_PY/copy_directory.py diff --git a/SU2_PY/copy_directory.py b/SU2_PY/copy_directory.py new file mode 100755 index 00000000000..aa42e27cc61 --- /dev/null +++ b/SU2_PY/copy_directory.py @@ -0,0 +1,11 @@ +#!/usr/bin/env python +# Copyright 2012-2023, SU2 Contributors (cf. AUTHORS.md) + +import sys +import os +import shutil + +if __name__ == "__main__": + src = os.path.abspath(sys.argv[1]) + dst = os.path.abspath(sys.argv[2]) + shutil.copytree(src, dst) diff --git a/meson.build b/meson.build index d42e96818fa..d8501b42db9 100644 --- a/meson.build +++ b/meson.build @@ -238,7 +238,7 @@ if get_option('enable-mpp') cmake_opts = cmake.subproject_options() cmake_opts.set_override_option('warning_level', '0') cmake_opts.add_cmake_defines({ - 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', + 'CMAKE_MAKE_PROGRAM': join_paths(meson.project_source_root(), 'ninja'), 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' }) cmake_opts.set_install(get_option('install-mpp')) @@ -249,8 +249,11 @@ if get_option('enable-mpp') su2_cpp_args += '-DHAVE_MPP' if get_option('install-mpp') - run_command('cp', '-r', join_paths(meson.source_root(), '/subprojects/Mutationpp/data'), - join_paths(get_option('prefix'), '/mpp-data'), check: true) + py = find_program('python3', 'python') + p = run_command(py, 'SU2_PY/copy_directory.py', 'subprojects/Mutationpp/data', join_paths(get_option('prefix'), 'mpp-data')) + if p.returncode() != 0 + error(p.stderr()) + endif endif endif @@ -261,7 +264,7 @@ if get_option('enable-coolprop') cmake_opts.set_override_option('warning_level', '0') cmake_opts.add_cmake_defines({ 'COOLPROP_STATIC_LIBRARY': true, - 'CMAKE_MAKE_PROGRAM': meson.source_root() + '/ninja', + 'CMAKE_MAKE_PROGRAM': join_paths(meson.project_source_root(), 'ninja'), 'CMAKE_POSITION_INDEPENDENT_CODE': 'ON' }) coolprop_subproj = cmake.subproject('CoolProp', options: cmake_opts) From d111f40af3dd7fcec4cdaf60084d77bf4f02d3d1 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 12 Aug 2023 19:13:46 -0700 Subject: [PATCH 14/18] remove env vars set in regression script --- TestCases/parallel_regression.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 658eee5fe53..8e3efe7c917 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -33,9 +33,6 @@ from TestCase import TestCase def main(): - os.environ['MPP_DATA_DIRECTORY'] = os.environ['SU2_RUN'] + "../mpp-data" - os.environ['LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH'] + ":" + os.environ['SU2_RUN'] + "../lib" - '''This program runs SU2 and ensures that the output matches specified values. This will be used to do checks when code is pushed to github to make sure nothing is broken. ''' From c2c208bedd37e9d7806c511b0558f879ffee0d85 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 13 Aug 2023 13:55:29 -0700 Subject: [PATCH 15/18] update docker images --- .github/workflows/regression.yml | 30 ++++++++++++------------ .github/workflows/release-management.yml | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 81b8750d8ea..1a46bec332b 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -52,12 +52,12 @@ jobs: key: ${{ matrix.config_set }}-${{ github.sha }} restore-keys: ${{ matrix.config_set }} - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/build-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} - name: Build - uses: docker://ghcr.io/su2code/su2/build-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103 with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries @@ -68,7 +68,7 @@ jobs: name: ${{ matrix.config_set }} path: install_bin.tgz - name: Post Cleanup - uses: docker://ghcr.io/su2code/su2/build-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -95,12 +95,12 @@ jobs: key: ${{ matrix.config_set }}-${{ github.sha }} restore-keys: ${{ matrix.config_set }} - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} - name: Build - uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103 with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries @@ -111,7 +111,7 @@ jobs: name: ${{ matrix.config_set }} path: install_bin.tgz - name: Post Cleanup - uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2-tsan:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -142,7 +142,7 @@ jobs: tag: OMP steps: - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -168,12 +168,12 @@ jobs: chmod a+x $BIN_FOLDER/* ls -lahR $BIN_FOLDER - name: Run Tests in Container - uses: docker://ghcr.io/su2code/su2/test-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103 with: # -t -c args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} - name: Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -188,7 +188,7 @@ jobs: testscript: ['hybrid_regression.py', 'hybrid_regression_AD.py'] steps: - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -214,12 +214,12 @@ jobs: chmod a+x $BIN_FOLDER/* ls -lahR $BIN_FOLDER - name: Run Tests in Container - uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103 with: # -t -c args: -b ${{github.ref}} -t develop -c develop -s ${{matrix.testscript}} -a "--tsan" - name: Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2-tsan:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -240,7 +240,7 @@ jobs: tag: MPI steps: - name: Pre Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} @@ -301,11 +301,11 @@ jobs: echo $PWD ls -lahR - name: Run Unit Tests - uses: docker://ghcr.io/su2code/su2/test-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103 with: entrypoint: install/bin/${{matrix.testdriver}} - name: Post Cleanup - uses: docker://ghcr.io/su2code/su2/test-su2:230704-1323 + uses: docker://ghcr.io/su2code/su2/test-su2:230813-0103 with: entrypoint: /bin/rm args: -rf install install_bin.tgz src ccache ${{ matrix.config_set }} diff --git a/.github/workflows/release-management.yml b/.github/workflows/release-management.yml index 45bb698198f..f0b680a6485 100644 --- a/.github/workflows/release-management.yml +++ b/.github/workflows/release-management.yml @@ -35,7 +35,7 @@ jobs: key: ${{ matrix.os_bin }}-${{ github.sha }} restore-keys: ${{ matrix.os_bin }} - name: Build - uses: docker://ghcr.io/su2code/su2/build-su2-cross:230704-1323 + uses: docker://ghcr.io/su2code/su2/build-su2-cross:230813-0103 with: args: -b ${{ github.sha }} -f "${{matrix.flags}}" - name: Create Archive From 510ded23e54fcc30b11d4e4949a6b8d647803c5b Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 13 Aug 2023 14:54:18 -0700 Subject: [PATCH 16/18] capture mpp files --- .github/workflows/regression.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 1a46bec332b..e0e2e3cefba 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -61,7 +61,7 @@ jobs: with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries - run: tar -zcvf install_bin.tgz install/bin + run: tar -zcvf install_bin.tgz install/bin install/lib install/mpp-data - name: Upload Binaries uses: actions/upload-artifact@v3 with: @@ -104,7 +104,7 @@ jobs: with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries - run: tar -zcvf install_bin.tgz install/bin + run: tar -zcvf install_bin.tgz install/bin install/lib install/mpp-data - name: Upload Binaries uses: actions/upload-artifact@v3 with: @@ -161,7 +161,7 @@ jobs: ls -lah tar -zxvf install_bin.tgz ls -lah install/bin/ - cp -r install/bin/* $BIN_FOLDER; + cp -r install/* $BIN_FOLDER/../ popd; fi done @@ -207,7 +207,7 @@ jobs: ls -lah tar -zxvf install_bin.tgz ls -lah install/bin/ - cp -r install/bin/* $BIN_FOLDER; + cp -r install/* $BIN_FOLDER/../ popd; fi done @@ -273,7 +273,7 @@ jobs: ls -lah tar -zxvf install_bin.tgz ls -laH install/bin/ - cp -r install/bin/* $BIN_FOLDER; + cp -r install/* $BIN_FOLDER/../ popd; else echo "$TYPE_FOLDER does not exist!" From c9500152c18d238c4201a3a032f959809f8f1f2e Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 13 Aug 2023 15:10:58 -0700 Subject: [PATCH 17/18] fix --- .github/workflows/regression.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index e0e2e3cefba..129913c82cf 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -61,7 +61,7 @@ jobs: with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries - run: tar -zcvf install_bin.tgz install/bin install/lib install/mpp-data + run: tar -zcvf install_bin.tgz install/* - name: Upload Binaries uses: actions/upload-artifact@v3 with: @@ -104,7 +104,7 @@ jobs: with: args: -b ${{github.ref}} -f "${{matrix.flags}}" - name: Compress binaries - run: tar -zcvf install_bin.tgz install/bin install/lib install/mpp-data + run: tar -zcvf install_bin.tgz install/* - name: Upload Binaries uses: actions/upload-artifact@v3 with: From f5160b2351f0addc9337d6500824c66eb00b6189 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 19 Aug 2023 19:39:23 -0700 Subject: [PATCH 18/18] go back to current version of mpp for now --- TestCases/parallel_regression.py | 1 - meson_scripts/init.py | 2 +- subprojects/Mutationpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 8e3efe7c917..81ed8e4f1c5 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -29,7 +29,6 @@ from __future__ import print_function import sys -import os from TestCase import TestCase def main(): diff --git a/meson_scripts/init.py b/meson_scripts/init.py index 214d4a9a599..eb69728e2a0 100755 --- a/meson_scripts/init.py +++ b/meson_scripts/init.py @@ -65,7 +65,7 @@ def init_submodules( github_repo_meson = "https://github.com/mesonbuild/meson" sha_version_ninja = "52649de2c56b63f42bc59513d51286531c595b44" github_repo_ninja = "https://github.com/ninja-build/ninja" - sha_version_mpp = "4cb6e3a05c15f49ffd346dc9f185ccc3459728b0" + sha_version_mpp = "5ff579f43781cae07411e5ab46291c9971536be6" github_repo_mpp = "https://github.com/mutationpp/Mutationpp" sha_version_coolprop = "0ce42fcf3bb2c373512bc825a4f0c1973a78f307" github_repo_coolprop = "https://github.com/CoolProp/CoolProp" diff --git a/subprojects/Mutationpp b/subprojects/Mutationpp index 4cb6e3a05c1..5ff579f4378 160000 --- a/subprojects/Mutationpp +++ b/subprojects/Mutationpp @@ -1 +1 @@ -Subproject commit 4cb6e3a05c15f49ffd346dc9f185ccc3459728b0 +Subproject commit 5ff579f43781cae07411e5ab46291c9971536be6