From c7226d3ddb42f74bd0a758b7424ad5f357a91377 Mon Sep 17 00:00:00 2001 From: congjian wang Date: Wed, 11 Mar 2020 12:04:13 -0600 Subject: [PATCH 01/17] add Logos plugin --- .gitmodules | 3 +++ plugins/LOGOS | 1 + 2 files changed, 4 insertions(+) create mode 160000 plugins/LOGOS diff --git a/.gitmodules b/.gitmodules index 20d1c8dad4..4f3afae69d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "plugins/CashFlow"] path = plugins/CashFlow url = git@hpcgitlab.hpc.inl.gov:RAVEN_PLUGINS/CashFlow.git +[submodule "plugins/LOGOS"] + path = plugins/LOGOS + url = git@hpcgitlab.hpc.inl.gov:RAVEN_PLUGINS/LOGOS.git diff --git a/plugins/LOGOS b/plugins/LOGOS new file mode 160000 index 0000000000..817a2e0687 --- /dev/null +++ b/plugins/LOGOS @@ -0,0 +1 @@ +Subproject commit 817a2e068704dd1a2bc809f4d8629d5def43d528 From 3fda83438a9382748de1d2a9a243046c2460be9d Mon Sep 17 00:00:00 2001 From: congjian wang Date: Wed, 11 Mar 2020 13:29:55 -0600 Subject: [PATCH 02/17] update Logos submodule ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 817a2e0687..5febec1a9f 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 817a2e068704dd1a2bc809f4d8629d5def43d528 +Subproject commit 5febec1a9f097e180a04844e56987c5fee777ba5 From d3c22dc7e8eef73f63d5c458592ff8d3aa3d4324 Mon Sep 17 00:00:00 2001 From: congjian wang Date: Wed, 11 Mar 2020 13:44:28 -0600 Subject: [PATCH 03/17] update LOGOS submodule ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 5febec1a9f..6a7606ca75 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 5febec1a9f097e180a04844e56987c5fee777ba5 +Subproject commit 6a7606ca759ab8526b9ffcf6762c191dcb4d8b01 From fe663e10e30cf786f9eec2436d89706d1b409335 Mon Sep 17 00:00:00 2001 From: congjian wang Date: Wed, 11 Mar 2020 15:28:03 -0600 Subject: [PATCH 04/17] update submodule id --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 6a7606ca75..4678c0c64c 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 6a7606ca759ab8526b9ffcf6762c191dcb4d8b01 +Subproject commit 4678c0c64c83bf0610d581be11792f06a7f7bf27 From 178c0b4acd98dd4530fcbc991be8a13030cdb3b3 Mon Sep 17 00:00:00 2001 From: congjian wang Date: Wed, 11 Mar 2020 16:15:38 -0600 Subject: [PATCH 05/17] update submodule ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 4678c0c64c..abf8ed4c20 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 4678c0c64c83bf0610d581be11792f06a7f7bf27 +Subproject commit abf8ed4c20e7fe72c4035896b89d9e353a2f5ee9 From d690a286b47e3429bc275ee486ad3c68ad1249ca Mon Sep 17 00:00:00 2001 From: congjian wang Date: Thu, 12 Mar 2020 12:07:52 -0600 Subject: [PATCH 06/17] skip check libraries ipopt, coincbc, glpk --- scripts/library_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/library_handler.py b/scripts/library_handler.py index e8e9826ce3..c1c6e8d87c 100644 --- a/scripts/library_handler.py +++ b/scripts/library_handler.py @@ -59,7 +59,7 @@ # -> see findLibAndVersion metaExceptions = ['pyside2', 'AMSC'] -skipChecks = ['python', 'hdf5', 'swig', 'nomkl'] +skipChecks = ['python', 'hdf5', 'swig', 'nomkl', 'ipopt', 'glpk', 'coincbc'] # load up the ravenrc if it's present ## TODO we only want to do this once, but does it need to get updated? From 18620b22a3db8cb8a5050483e14e7da6bbc1a6a5 Mon Sep 17 00:00:00 2001 From: congjian wang Date: Thu, 12 Mar 2020 12:25:21 -0600 Subject: [PATCH 07/17] update LOGOS ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index abf8ed4c20..2ee8ddf499 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit abf8ed4c20e7fe72c4035896b89d9e353a2f5ee9 +Subproject commit 2ee8ddf499a2fa5df4d21565b8c697dad371571a From c7f3babad5fea3eee42b3cfb6c0f0740698e06c4 Mon Sep 17 00:00:00 2001 From: congjian wang Date: Thu, 12 Mar 2020 13:34:17 -0600 Subject: [PATCH 08/17] update submodule ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 2ee8ddf499..1bdbbba01d 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 2ee8ddf499a2fa5df4d21565b8c697dad371571a +Subproject commit 1bdbbba01d8d956c7b6b2a8207ea92bd3f7c3bae From 5dc5d384b9be77d1687c8e3b5afdaead6a851709 Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Mon, 16 Mar 2020 16:16:49 -0600 Subject: [PATCH 09/17] add skip-check for library_handler --- dependencies.ini | 6 ++++++ scripts/library_handler.py | 27 ++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dependencies.ini b/dependencies.ini index 742aec7a07..9aad255664 100644 --- a/dependencies.ini +++ b/dependencies.ini @@ -83,3 +83,9 @@ pip = remove python = remove nomkl = remove numexpr = remove + +[skip-check] +python +hdf5 +swig +nomkl diff --git a/scripts/library_handler.py b/scripts/library_handler.py index e8e9826ce3..8333957db2 100644 --- a/scripts/library_handler.py +++ b/scripts/library_handler.py @@ -59,8 +59,6 @@ # -> see findLibAndVersion metaExceptions = ['pyside2', 'AMSC'] -skipChecks = ['python', 'hdf5', 'swig', 'nomkl'] - # load up the ravenrc if it's present ## TODO we only want to do this once, but does it need to get updated? rcFile = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '.ravenrc')) @@ -100,10 +98,11 @@ def checkLibraries(buildReport=False): notQA = [] plugins = pluginHandler.getInstalledPlugins() need = getRequiredLibs(plugins=plugins) + skipCheckLibs = getSkipCheckLibs(plugins=plugins) messages = [] for lib, needVersion in need.items(): # some libs aren't checked from within python - if lib in skipChecks: + if lib in skipCheckLibs: continue found, msg, foundVersion = checkSingleLibrary(lib, version=needVersion) if not found: @@ -240,6 +239,28 @@ def getRequiredLibs(useOS=None, installMethod=None, addOptional=False, limit=Non libs.update(pluginLibs) return libs +def getSkipCheckLibs(plugins=None): + """ + Assembles dictionary of libraries that would not be checked. + @ In, plugins, list(tuple(str,str)), optional, plugins (name, location) that should be added to + the required libs + @ Out, skipCheckLibs, dict, dictionary of libraries {name: version} + """ + skipCheckLibs = OrderedDict() + mainConfigFile = os.path.abspath(os.path.expanduser(os.path.join(os.path.dirname(__file__), + '..', 'dependencies.ini'))) + config = _readDependencies(mainConfigFile) + if config.has_section('skip-check'): + _addLibsFromSection(config.items('skip-check'), skipCheckLibs) + # extend config with plugin libs + for pluginName, pluginLoc in plugins: + pluginConfigFile = os.path.join(pluginLoc, 'dependencies.ini') + if os.path.isfile(pluginConfigFile): + pluginConfig = _readDependencies(pluginConfigFile) + if pluginConfig.has_section('skip-check'): + _addLibsFromSection(pluginConfig.items('skip-check'), skipCheckLibs) + return skipCheckLibs + def _checkForUpdates(libs, pluginLibs, pluginName): """ Checks requested lib updates for conflicts From 5967c0a76ef25ab5d52b4bdd002a261f8f58b31b Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Tue, 17 Mar 2020 09:33:18 -0600 Subject: [PATCH 10/17] update for library handler --- plugins/LOGOS | 2 +- scripts/library_handler.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 1bdbbba01d..2518e50778 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 1bdbbba01d8d956c7b6b2a8207ea92bd3f7c3bae +Subproject commit 2518e5077843230269e2880831d401e1fea3148d diff --git a/scripts/library_handler.py b/scripts/library_handler.py index 8333957db2..ce23e0763b 100644 --- a/scripts/library_handler.py +++ b/scripts/library_handler.py @@ -367,6 +367,12 @@ def _parseLibs(config, opSys, install, addOptional=False, limit=None, plugins=No # os-specific are part of 'core' right now if config.has_section(opSys) and (True if limit is None else ('core' in limit)): _addLibsFromSection(config.items(opSys), libs) + # os-specific of specific installer (e.g. pip) + if limit: + for lim in limit: + instSpecOp = "{opSys}-{lim}".format(lim=lim, opSys=opSys) + if config.has_section(instSpecOp): + _addLibsFromSection(config.items(instSpecOp), libs) # optional are part of 'core' right now, but leave that up to the requester? if addOptional and config.has_section('optional'): _addLibsFromSection(config.items('optional'), libs) From 421c66bdb93388512002f5af8e62f50fa3a954a1 Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Tue, 17 Mar 2020 11:41:19 -0600 Subject: [PATCH 11/17] update LOGOS submodule ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 2518e50778..38f0b84d36 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 2518e5077843230269e2880831d401e1fea3148d +Subproject commit 38f0b84d369fc372dfe857b0ed6c2a77ecf35317 From d8a758c173b2b1e30b24d7ad1d09408ce867ce5a Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Tue, 17 Mar 2020 15:29:31 -0600 Subject: [PATCH 12/17] update LOGOS submodule ID, all LOGOS tests should be now tested --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 38f0b84d36..08fe5b9371 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 38f0b84d369fc372dfe857b0ed6c2a77ecf35317 +Subproject commit 08fe5b93712ad83ea1a2352d83622830c317c505 From 345147465b1a1d56d9303e1e323dc688780d3a58 Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Tue, 17 Mar 2020 16:36:24 -0600 Subject: [PATCH 13/17] update LOGOS submodule ID, increase max time for test logos_skp_EE_41_projects --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 08fe5b9371..3352dedc77 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 08fe5b93712ad83ea1a2352d83622830c317c505 +Subproject commit 3352dedc7716a57711ddffc28cc9ea402958d156 From a6c86c985efcfb5837e82d39fe8eb5a51d0d834c Mon Sep 17 00:00:00 2001 From: alfoa Date: Thu, 19 Mar 2020 13:33:42 -0600 Subject: [PATCH 14/17] fixes plugin installation in Win machiens --- scripts/install_plugins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_plugins.py b/scripts/install_plugins.py index a8f12b3cd0..8a197801d5 100755 --- a/scripts/install_plugins.py +++ b/scripts/install_plugins.py @@ -66,9 +66,9 @@ os.chdir(cwd) subsOut = os.popen('git config --file .gitmodules --name-only --get-regexp path').read() ## subsInit are the initialized ones - subsInit = [x.split(' ')[1] for x in os.popen('git submodule status').read().split(os.linesep) if x.strip() != ''] + subsInit = [x.split(' ')[1] for x in os.popen('git submodule status').read().split("\n") if x.strip() != ''] submods = [] - for m, sub in enumerate(subsOut.split(os.linesep)): + for m, sub in enumerate(subsOut.split("\n")): if sub.strip() != '': submods.append(os.path.basename(sub)[:-5]) #trim off path, ".path" From d096dc30091ec802f9689fb0b725a87f44c052fd Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Thu, 19 Mar 2020 15:10:13 -0600 Subject: [PATCH 15/17] update LOGOS submodule ID, move some tests to heavy, and disable csv checks for some mkp tests due to not unique solutions --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index 3352dedc77..ecb1a38a8d 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit 3352dedc7716a57711ddffc28cc9ea402958d156 +Subproject commit ecb1a38a8dd615db453f73e4f0119596e5cecba8 From 96b3b8f3ffbebcd205358965e334733f17885afe Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Tue, 5 May 2020 09:25:13 -0600 Subject: [PATCH 16/17] update submodule ID --- plugins/LOGOS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/LOGOS b/plugins/LOGOS index a2e1f27d50..220eb67b56 160000 --- a/plugins/LOGOS +++ b/plugins/LOGOS @@ -1 +1 @@ -Subproject commit a2e1f27d50ad79d842c0286acb732db984874f42 +Subproject commit 220eb67b56da3ae97517495764edc42f0de97e0b From 1418cacbdd91aafc2fee0afb404f7ca17d134c32 Mon Sep 17 00:00:00 2001 From: "Wang, Congjian" Date: Tue, 5 May 2020 10:57:24 -0600 Subject: [PATCH 17/17] skip testLimitSurfaceIntegralPPWithBoundingError --- tests/framework/PostProcessors/LimitSurface/tests | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/framework/PostProcessors/LimitSurface/tests b/tests/framework/PostProcessors/LimitSurface/tests index d814c8cbfe..ab7547c9f0 100644 --- a/tests/framework/PostProcessors/LimitSurface/tests +++ b/tests/framework/PostProcessors/LimitSurface/tests @@ -34,6 +34,7 @@ csv = 'limitSurfaceBoundingError/LimitSurfaceWeightedPb_dump.csv' max_time = 300 rel_err = 0.001 + skip_if_OS = windows [../]