From 963f55e8972d1a7dd0c97730166213a673d98bcd Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 28 Sep 2022 10:33:21 -0600 Subject: [PATCH 01/11] Updating to ray2 --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index f8b41f24dd..7d36c4bfee 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -60,7 +60,7 @@ Note all install methods after "main" take - 1.13 + 2.0 2.9 From 743a8f0b82c2408eef489413c007c41916ac89f6 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Fri, 30 Sep 2022 09:50:01 -0600 Subject: [PATCH 02/11] More debugging info. --- ravenframework/JobHandler.py | 2 ++ .../InternalParallelTests/test_internal_parallel_ROM_scikit.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ravenframework/JobHandler.py b/ravenframework/JobHandler.py index 90378159ab..7f5a809a0c 100644 --- a/ravenframework/JobHandler.py +++ b/ravenframework/JobHandler.py @@ -220,6 +220,7 @@ def __initializeRay(self): self.raiseADebug("Executing RAY in the cluster but with a single node configuration") self.rayServer = ray.init(num_cpus=nProcsHead,log_to_driver=False,include_dashboard=db) else: + self.raiseADebug("Initializing", "ray" if _rayAvail else "pp","locally with num_cpus: ", self.runInfoDict['totalNumCoresUsed']) self.rayServer = ray.init(num_cpus=int(self.runInfoDict['totalNumCoresUsed']),include_dashboard=db) if _rayAvail else \ pp.Server(ncpus=int(self.runInfoDict['totalNumCoresUsed'])) if _rayAvail: @@ -228,6 +229,7 @@ def __initializeRay(self): self.raiseADebug("Object store address: ", self.rayServer.address_info['object_store_address']) self.raiseADebug("Raylet socket name : ", self.rayServer.address_info['raylet_socket_name']) self.raiseADebug("Session directory : ", self.rayServer.address_info['session_dir']) + self.raiseADebug("GCS Address : ", self.rayServer.address_info['gcs_address']) if servers: self.raiseADebug("# of remote servers : ", str(len(servers))) self.raiseADebug("Remote servers : ", " , ".join(servers)) diff --git a/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml b/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml index 67e8df72c5..0e542f84d7 100644 --- a/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml +++ b/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml @@ -1,5 +1,5 @@ - + framework/InternalParallelTests.ROMscikit alfoa From ca0493de88dc04b687f03d2cef3ac5d2954fbfd7 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Fri, 30 Sep 2022 12:53:32 -0600 Subject: [PATCH 03/11] Moving updating pythonpath to anytime ray is used. --- ravenframework/JobHandler.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ravenframework/JobHandler.py b/ravenframework/JobHandler.py index 7f5a809a0c..305a2130cf 100644 --- a/ravenframework/JobHandler.py +++ b/ravenframework/JobHandler.py @@ -178,6 +178,11 @@ def __initializeRay(self): if 'UPDATE_PYTHONPATH' in self.runInfoDict: sys.path.extend([p.strip() for p in self.runInfoDict['UPDATE_PYTHONPATH'].split(":")]) + if _rayAvail: + # update the python path and working dir + olderPath = os.environ["PYTHONPATH"].split(os.pathsep) if "PYTHONPATH" in os.environ else [] + os.environ["PYTHONPATH"] = os.pathsep.join(set(olderPath+sys.path)) + # is ray instanciated outside? self.rayInstanciatedOutside = 'headNode' in self.runInfoDict if len(self.runInfoDict['Nodes']) > 0 or self.rayInstanciatedOutside: @@ -206,11 +211,6 @@ def __initializeRay(self): self.raiseADebug("Head host IP :", address) ## Get servers and run ray remote listener servers = self.runInfoDict['remoteNodes'] if self.rayInstanciatedOutside else self.__runRemoteListeningSockets(address, localHostName) - if self.rayInstanciatedOutside: - # update the python path and working dir - # update head node paths - olderPath = os.environ["PYTHONPATH"].split(os.pathsep) if "PYTHONPATH" in os.environ else [] - os.environ["PYTHONPATH"] = os.pathsep.join(set(olderPath+sys.path)) # add names in runInfo self.runInfoDict['remoteNodes'] = servers ## initialize ray server with nProcs From a008ff0b5cc8065c59750740fcaf7c249645d3bc Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Tue, 4 Oct 2022 16:26:40 -0600 Subject: [PATCH 04/11] Removing debug verbosity. --- .../InternalParallelTests/test_internal_parallel_ROM_scikit.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml b/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml index 0e542f84d7..67e8df72c5 100644 --- a/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml +++ b/tests/framework/InternalParallelTests/test_internal_parallel_ROM_scikit.xml @@ -1,5 +1,5 @@ - + framework/InternalParallelTests.ROMscikit alfoa From 7d6c2af02340f8a5212041999bfa1255147cd5ea Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Tue, 4 Oct 2022 16:28:25 -0600 Subject: [PATCH 05/11] Use correct directory. --- ravenframework/CustomDrivers/DriverUtils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ravenframework/CustomDrivers/DriverUtils.py b/ravenframework/CustomDrivers/DriverUtils.py index d9a5fe1328..039a01ee9c 100644 --- a/ravenframework/CustomDrivers/DriverUtils.py +++ b/ravenframework/CustomDrivers/DriverUtils.py @@ -80,7 +80,8 @@ def setupFramework(): @ In, None @ Out, None """ - frameworkDir = findFramework() + #Get the directory above the ravenframework directory + frameworkDir = os.path.dirname(findFramework()) if frameworkDir not in sys.path: sys.path.append(frameworkDir) From 164e3722c0548b0c33588f7bb06a5b8fd43f10fa Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 21 Nov 2022 10:33:30 -0700 Subject: [PATCH 06/11] Try with any ray 2. --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index 0c3aed1eb8..0329d42c45 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -66,7 +66,7 @@ Note all install methods after "main" take - 2.0 + 2 2.22 From 23e349a4e384a48757727c53bb0ec9f1331e4ca8 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Mon, 21 Nov 2022 14:09:20 -0700 Subject: [PATCH 07/11] Try windows with 3.8 --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index 1b5fa85e93..79e00753d9 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -53,7 +53,7 @@ Note all install methods after "main" take 0.13 2.2 2.9 - 3.7 + 3.8 3 From 79a950e6ce6f22b33207eebad00990d47a20982b Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Tue, 22 Nov 2022 09:30:23 -0700 Subject: [PATCH 08/11] Try python 3.9 --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index 79e00753d9..c783aa4592 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -53,7 +53,7 @@ Note all install methods after "main" take 0.13 2.2 2.9 - 3.8 + 3.9 3 From 7e3ac9a7524ba7cb3e058624eec81631aa13a482 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Tue, 22 Nov 2022 11:58:52 -0700 Subject: [PATCH 09/11] Adding comment. --- dependencies.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dependencies.xml b/dependencies.xml index c783aa4592..fe3c685745 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -53,6 +53,7 @@ Note all install methods after "main" take 0.13 2.2 2.9 + 3.9 3 From 12e9992c1049b2edf03c794a91a593d87037418a Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Tue, 22 Nov 2022 14:56:04 -0700 Subject: [PATCH 10/11] Switch only linux and mac to ray 2. --- dependencies.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dependencies.xml b/dependencies.xml index fe3c685745..ab82ab8fd4 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -54,7 +54,7 @@ Note all install methods after "main" take 2.2 2.9 - 3.9 + 3.7 3 @@ -68,7 +68,8 @@ Note all install methods after "main" take - 2 + 2 + 1.13 2.22 From b5ef4c9c58e81c6a2c2712ba5e49ec021170f6c1 Mon Sep 17 00:00:00 2001 From: "Joshua J. Cogliati" Date: Wed, 23 Nov 2022 08:38:16 -0700 Subject: [PATCH 11/11] Switching to specifying ray 2.1 since ray sometimes has incompatible changes. --- dependencies.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.xml b/dependencies.xml index ab82ab8fd4..b29ebc7270 100644 --- a/dependencies.xml +++ b/dependencies.xml @@ -68,7 +68,7 @@ Note all install methods after "main" take - 2 + 2.1 1.13