Add to missed test

Add debug messages for cmake hang on windows command promp
cropsinsilico · Jul 15, 2024 · 9365eb7 · 9365eb7
1 parent 4b88d68
commit 9365eb7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml
@@ -540,7 +540,7 @@ jobs:
         == 'mamba')
       name: Run cmake test in command prompt (CONDA)
       run: CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture
-        tests/drivers/test_CMakeModelDriver.py
+        --ygg-debug tests/drivers/test_CMakeModelDriver.py
       shell: cmd /C CALL {0}
       timeout-minutes: 180
     - if: runner.os == 'Windows' && matrix.install-method != 'conda' && matrix.install-method
@@ -957,7 +957,7 @@ jobs:
         == 'mamba')
       name: Run cmake test in command prompt (CONDA)
       run: CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture
-        tests/drivers/test_CMakeModelDriver.py
+        --ygg-debug tests/drivers/test_CMakeModelDriver.py
       shell: cmd /C CALL {0}
       timeout-minutes: 180
     - if: runner.os == 'Windows' && matrix.install-method != 'conda' && matrix.install-method
@@ -1350,7 +1350,7 @@ jobs:
         == 'mamba')
       name: Run cmake test in command prompt (CONDA)
       run: CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture
-        tests/drivers/test_CMakeModelDriver.py
+        --ygg-debug tests/drivers/test_CMakeModelDriver.py
       shell: cmd /C CALL {0}
       timeout-minutes: 180
     - if: runner.os == 'Windows' && matrix.install-method != 'conda' && matrix.install-method
@@ -1724,7 +1724,7 @@ jobs:
         == 'mamba')
       name: Run cmake test in command prompt (CONDA)
       run: CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture
-        tests/drivers/test_CMakeModelDriver.py
+        --ygg-debug tests/drivers/test_CMakeModelDriver.py
       shell: cmd /C CALL {0}
       timeout-minutes: 180
     - if: runner.os == 'Windows' && matrix.install-method != 'conda' && matrix.install-method
@@ -2097,7 +2097,7 @@ jobs:
         == 'mamba')
       name: Run cmake test in command prompt (CONDA)
       run: CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture
-        tests/drivers/test_CMakeModelDriver.py
+        --ygg-debug tests/drivers/test_CMakeModelDriver.py
       shell: cmd /C CALL {0}
       timeout-minutes: 180
     - if: runner.os == 'Windows' && matrix.install-method != 'conda' && matrix.install-method

diff --git a/utils/test-install-base.yml b/utils/test-install-base.yml
@@ -334,7 +334,7 @@ jobs:
       # run: >-
       #   pytest --ci --cov-append --nocapture --ygg-debug tests/drivers/test_CMakeModelDriver.py
       run: >-
-        CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture tests/drivers/test_CMakeModelDriver.py
+        CALL "%CONDA_BAT%" activate test && pytest --ci --cov-append --nocapture --ygg-debug tests/drivers/test_CMakeModelDriver.py
     - name: Run cmake test in command prompt (PIP)
       timeout-minutes: 180
       if: runner.os == 'Windows' && matrix.install-method != 'conda' && matrix.install-method != 'mamba'

diff --git a/yggdrasil/drivers/CompiledModelDriver.py b/yggdrasil/drivers/CompiledModelDriver.py
@@ -6728,6 +6728,7 @@ def init_model(self):
         super(CompiledModelDriver, self).init_model()
         # Compile
         if not self.skip_compile:
+            self.debug(f"Building {self.model_file}")
             self.build_model(products=self.products)
             self.debug(f"Built {self.model_file}")
 

diff --git a/yggdrasil/drivers/ModelDriver.py b/yggdrasil/drivers/ModelDriver.py
@@ -883,14 +883,17 @@ def __init__(self, name, args, model_index=0, copy_index=-1, clients=[],
         # Parse arguments
         self.debug(str(args))
         self.parse_arguments(args)
+        self.debug("Finished self.parse_arguments")
         assert self.model_file is not None
         # Add wrappers
         self.write_wrappers()
         # Initialize the model, creating files with inter-process locks
         #   if necessary
         self.locked_file = None
+        self.debug("Before mpi_init")
         with self.mpi_init():
             self.init_model()
+        self.debug("Finished init")
 
     def init_model(self):
         r"""Initialize the model executable."""
@@ -1073,8 +1076,11 @@ def mpi_init(self):
         if self._mpi_rank > 0:
             self.send_mpi(self.file_locks.message,
                           tag=self._mpi_tags['FILELOCKS'])
+        self.debug("Before init lock")
         with self.file_locks.locked_condition('init', self):
+            self.debug("Acquired init lock")
             yield
+            self.debug("Releasing init lock")
 
     @contextlib.contextmanager
     def mpi_cleanup(self):