From e377aa0691ed0e9a2dc36dc7625cbccc74c3bcbf Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 4 Oct 2021 10:30:39 +0200
Subject: [PATCH] [ci] Use container-makers --cpu-target flag.
---
ThirdParty/container-maker | 2 +-
scripts/ci/jobs/jupyter.yml | 3 ++-
scripts/cmake/CompilerSetup.cmake | 2 +-
web/content/docs/devguide/advanced/configuration-options.md | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 03a8692f71a..11e23b0d9e7 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 03a8692f71aee9932a333d5a5d0f87e59084e697
+Subproject commit 11e23b0d9e7df18973617ad193a1fdfb8ccc1e27
diff --git a/scripts/ci/jobs/jupyter.yml b/scripts/ci/jobs/jupyter.yml
index 323454e0ed0..9b69ebac98f 100644
--- a/scripts/ci/jobs/jupyter.yml
+++ b/scripts/ci/jobs/jupyter.yml
@@ -19,7 +19,8 @@ build jupyter:
poetry run ogscm compiler.py ogs.py ogs_jupyter.py -B -R --ogs ../..
--build_args ' --progress=plain'
--cvode --ccache --mfront
- --cmake_args ' -DOGS_CPU_ARCHITECTURE=sandybridge -DOGS_BUILD_TESTING=OFF'
+ --cpu-target sandybridge
+ --cmake_args ' -DOGS_CPU_ARCHITECTURE=OFF -DOGS_BUILD_TESTING=OFF'
--runtime_base_image 'jupyter/base-notebook'
--tag $DOCKER_TAG_JUPYTER
$ON_MASTER_ARGS
diff --git a/scripts/cmake/CompilerSetup.cmake b/scripts/cmake/CompilerSetup.cmake
index 330ff4981cc..1de8c3c7664 100644
--- a/scripts/cmake/CompilerSetup.cmake
+++ b/scripts/cmake/CompilerSetup.cmake
@@ -75,7 +75,7 @@ if(COMPILER_IS_GCC OR COMPILER_IS_CLANG OR COMPILER_IS_INTEL)
set(CPU_FLAGS -mavx2 -march=core-avx2)
elseif(OGS_CPU_ARCHITECTURE STREQUAL "generic")
set(CPU_FLAGS -mtune=generic)
- elseif(NOT APPLE_ARM)
+ elseif(NOT APPLE_ARM AND OGS_CPU_ARCHITECTURE)
set(CPU_FLAGS -march=${OGS_CPU_ARCHITECTURE})
endif()
diff --git a/web/content/docs/devguide/advanced/configuration-options.md b/web/content/docs/devguide/advanced/configuration-options.md
index 995a0540d50..019c686f125 100644
--- a/web/content/docs/devguide/advanced/configuration-options.md
+++ b/web/content/docs/devguide/advanced/configuration-options.md
@@ -43,5 +43,5 @@ CMake switches to enable / disable parts of OGS.
- `OGS_CXX_FLAGS` - Appends user-given compiler flags. Note that existing (CMake-given) flags are not replaced.
- `OGS_PACKAGE_ADDITIONAL_BINARIES` - Package additional binaries (given as a `;`-separated list with relative paths to `CMAKE_BINARY_DIR`) into redistributables. Is used for bundling the OGS File Converter with the Data Explorer.
-- `OGS_CPU_ARCHITECTURE` - Optimizes for the given CPU architecture see [-march](https://gcc.gnu.org/onlinedocs/gcc-4.5.3/gcc/i386-and-x86_002d64-Options.html)-flag. Defaults to `native`. For redistributable binaries set to `generic` on Linux and `core2` on Mac OS.
+- `OGS_CPU_ARCHITECTURE` - Optimizes for the given CPU architecture see [-march](https://gcc.gnu.org/onlinedocs/gcc-4.5.3/gcc/i386-and-x86_002d64-Options.html)-flag. Defaults to `native`. For redistributable binaries set to `generic` on Linux and `core2` on Mac OS. Can be disabled when set to `OFF`.
- `CMAKE_LIBRARY_SEARCH_PATH` - Additional library installation path, e.g. `/opt/local` or `C:/libs`
--
GitLab