diff --git a/codemeta.json b/codemeta.json index 80eae259819ca27f9ae72d496a677a1a81571067..efade12f87fdaf8694df3c1a2a1fe749945beeae 100644 --- a/codemeta.json +++ b/codemeta.json @@ -10,7 +10,7 @@ "downloadUrl": "https://pypi.org/project/ogscm", "issueTracker": "https://gitlab.opengeosys.org/ogs/container-maker/-/issues", "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.", "developmentStatus": "active", "isPartOf": "https://www.opengeosys.org", diff --git a/ogscm/recipes/ogs.py b/ogscm/recipes/ogs.py index a6230a307619f142b89253d573250e798d987234..8491a2da7803779aee70f845bca49d1fdb625769 100644 --- a/ogscm/recipes/ogs.py +++ b/ogscm/recipes/ogs.py @@ -13,6 +13,7 @@ from hpccm.building_blocks import ( generic_autotools, generic_cmake, hdf5, + mkl, packages, pip, scif, @@ -106,6 +107,7 @@ parse_g.add_argument( action="store_true", 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 local_args = parser.parse_known_args()[0] @@ -423,6 +425,10 @@ if local_args.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: Stage0 += ccache(cache_size="15G") if local_args.ogs != "off" and local_args.ogs != "clean": diff --git a/pyproject.toml b/pyproject.toml index 5f4d22b7337d76660aaa3575d0baa2303232c4c2..e7f77576ce05f2af664a8fdc2f54c8094e5c9121 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "ogscm" -version = "2.0.2" +version = "2.0.3" description = "OGS Container Maker" authors = ["Lars Bilke <lars.bilke@ufz.de>"] license = "BSD 3-clause" @@ -15,7 +15,7 @@ PyYAML = "^5.3.1" packaging = "^20.4" [tool.poetry.dev-dependencies] -black = {version = "^20.8b1", allow-prereleases = true} +black = { version = "^20.8b1", allow-prereleases = true } [tool.poetry.scripts] ogscm = "ogscm.cli:main"