Skip to content
Snippets Groups Projects
Commit 25e51885 authored by Lars Bilke's avatar Lars Bilke
Browse files

v2.0.3

parent b4cb9ba7
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"downloadUrl": "https://pypi.org/project/ogscm", "downloadUrl": "https://pypi.org/project/ogscm",
"issueTracker": "https://gitlab.opengeosys.org/ogs/container-maker/-/issues", "issueTracker": "https://gitlab.opengeosys.org/ogs/container-maker/-/issues",
"name": "ogs-container-maker", "name": "ogs-container-maker",
"version": "2.0.2", "version": "2.0.3",
"description": "An extension of hpc-container-maker to generate container definition files for the OpenGeoSys software.", "description": "An extension of hpc-container-maker to generate container definition files for the OpenGeoSys software.",
"developmentStatus": "active", "developmentStatus": "active",
"isPartOf": "https://www.opengeosys.org", "isPartOf": "https://www.opengeosys.org",
......
...@@ -13,6 +13,7 @@ from hpccm.building_blocks import ( ...@@ -13,6 +13,7 @@ from hpccm.building_blocks import (
generic_autotools, generic_autotools,
generic_cmake, generic_cmake,
hdf5, hdf5,
mkl,
packages, packages,
pip, pip,
scif, scif,
...@@ -106,6 +107,7 @@ parse_g.add_argument( ...@@ -106,6 +107,7 @@ parse_g.add_argument(
action="store_true", action="store_true",
help="Installs development tools (vim, gdb)", help="Installs development tools (vim, gdb)",
) )
parse_g.add_argument("--mkl", dest="mkl", action="store_true", help="Use MKL. By setting this option, you agree to the [Intel End User License Agreement](https://software.intel.com/en-us/articles/end-user-license-agreement).")
# Parse local args # Parse local args
local_args = parser.parse_known_args()[0] local_args = parser.parse_known_args()[0]
...@@ -423,6 +425,10 @@ if local_args.tfel: ...@@ -423,6 +425,10 @@ if local_args.tfel:
) )
Stage0 += environment(variables={"TFELHOME": "/usr/local/tfel"}) Stage0 += environment(variables={"TFELHOME": "/usr/local/tfel"})
if local_args.mkl:
Stage0 += mkl(eula=True)
cmake_args.append("-DOGS_USE_MKL=ON")
if local_args.ccache: if local_args.ccache:
Stage0 += ccache(cache_size="15G") Stage0 += ccache(cache_size="15G")
if local_args.ogs != "off" and local_args.ogs != "clean": if local_args.ogs != "off" and local_args.ogs != "clean":
......
[tool.poetry] [tool.poetry]
name = "ogscm" name = "ogscm"
version = "2.0.2" version = "2.0.3"
description = "OGS Container Maker" description = "OGS Container Maker"
authors = ["Lars Bilke <lars.bilke@ufz.de>"] authors = ["Lars Bilke <lars.bilke@ufz.de>"]
license = "BSD 3-clause" license = "BSD 3-clause"
...@@ -15,7 +15,7 @@ PyYAML = "^5.3.1" ...@@ -15,7 +15,7 @@ PyYAML = "^5.3.1"
packaging = "^20.4" packaging = "^20.4"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
black = {version = "^20.8b1", allow-prereleases = true} black = { version = "^20.8b1", allow-prereleases = true }
[tool.poetry.scripts] [tool.poetry.scripts]
ogscm = "ogscm.cli:main" ogscm = "ogscm.cli:main"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment