Allow restart check to wait for files to write

docs/geos_ats.rst

@@ -26,6 +26,18 @@ Primary entry point for running integrated tests.
     Other machine-specific options for ATS can be viewed by running `run_geos_ats --ats help`
 
 
+Debugging
+------------------
+
+If for any reason you need to debug the geos_ats package, we recommend that you create a local copy of this entry point in the `build/integratedTests` directory: `geosPythonPackages/geos_ats_package/geos_ats/debug_geos_ats.py`.
+This script is designed as a debugger entry point, and will read the autogenerated run script that was built during setup.
+To use it, you must either have geos_ats installed in your target python environment, or a copy of geosPythonPackages in the expected location (`/usr/workspace/[username]/geosPythonPackages`).
+
+We recommend that you use VSCode with the Python extension to debug geos_ats.
+To begin the debugging session, you simply need to load the entry script, set any initial breakpoints you desire, then select the Debug run option.
+Note that this approach can only be used to debug the python code associated with tests, and not the underlying GEOS tests.
+
+
 API
 ------
 

docs/index.rst

@@ -15,23 +15,58 @@ The preferred method to setup the GEOSX python tools is to run the following com
     make geosx_python_tools
 
 
-This will attempt to install the required packages into the python distribution indicated via the `Python3_EXECUTABLE` cmake variable (also used by pygeosx).
+The ats setup command also sets up the python tools:
 
-If the user does not have write access for the target python distribution, the installation will attempt to create a new virtual python environment (Note: this requires that the virtualenv package be installed).
+.. code-block:: bash
+
+    make ats_environment
+
+
+These will attempt to install the required packages into the python distribution indicated via the `Python3_EXECUTABLE` cmake variable (also used by pygeosx).
 If any package dependencies are missing, then the install script will attempt to fetch them from the internet using pip.
 After installation, these packages will be available for import within the associated python distribution, and a set of console scripts will be available within the GEOSX build bin directory.
 
-Alternatively, these packages can be installed manually into a python environment using pip:
+
+.. note::
+    To re-install or update an installed version of geosPythonTools, you can run the `make geosx_python_tools_clean` and `make geosx_python_tools` commands.
+
+
+Manual Installation
+---------------------------------
+
+In some cases, you may need to manually install or update geosPythonPackages.
+To do this, you can clone a copy of the geosPythonPackages repository and install them using pip:
+
 
 .. code-block:: bash
 
-    cd GEOSX/src/coreComponents/python/modules/geosx_mesh_tools_package
-    pip install --upgrade .
+    cd /path/to/store/python/tools
+    git clone https://github.com/GEOS-DEV/geosPythonPackages.git
+
+    # Install/upgrade geos_ats
+    cd geosPythonPackages/geos_ats_package
+    python -m pip install --upgrade .
+
+
+.. note::
+    To upgrade an existing installation, the python executable in the above command should correspond to the version you indicated in your host config.  If you have previously built the tools, this version will be linked in the build directory: `build_dir/bin/python`.
+
+
+Development & Debugging
+---------------------------
+
+Be default, the python environment setup commands target the "main" branch of geosPythonTools.
+To target another version of the tools, you can set the `GEOS_PYTHON_PACKAGES_BRANCH` cmake variable to the name of another valid branch (or git tag) in the host config file.
+In this case, the code will pull the most recent commit of the desired branch when building geosPythonTools.
+
+
+.. note::
+    If you are working on significant updates to geosPythonTools, you should open a testing branch in the main GEOS repository that defines the `GEOS_PYTHON_PACKAGES_BRANCH` variable.  This will ensure that your changes are tested as part of the GEOS CI.
+
 
-    cd ../geosx_xml_tools_package
-    pip install --upgrade .
+If you need to debug one of the packages in geosPythonTools, we recommend using VSCode with the Python extension installed.
+Some of the packages contain specific entry point scripts that can be used to assist in this process.
 
-    # Etc.
 
 
 Packages

geos_ats_package/geos_ats/debug_geos_ats.py

@@ -0,0 +1,37 @@
+"""
+Entry point for debugging geos_ats
+
+To use this script, do the following:
+- Setup your ats environment (using the 'make ats_environment' command)
+- Create a copy of this script in the build/integratedTests directory
+- Debug this script with a tool like vscode
+
+Note: if you have a copy of the geosPythonPackages repository located
+in your user workspace, then this script will attempt to use that version
+of geos_ats instead of the one installed in your environment.
+"""
+
+import os
+import sys
+
+
+def debug_geos_ats():
+    # Check for a copy of geos_ats in the user's workspace to use
+    # instead of any currently installed in python
+    user = os.environ.get( 'USER', '' )
+    mod_path = f"/usr/workspace/{user}/geosPythonPackages/geos_ats_package"
+    if os.path.isdir( mod_path ):
+        sys.path.insert( 0, os.path.join( mod_path ) )
+
+    # Collect command line args from autogenerated script
+    fname = os.path.join( os.path.dirname( __file__ ), 'geos_ats.sh' )
+    args = open( fname, 'r' ).readlines()[ 1 ].split()[ 1:-1 ]
+    sys.argv.extend( args )
+
+    # Run ats
+    from geos_ats import main
+    main.main()
+
+
+if __name__ == '__main__':
+    debug_geos_ats()

geos_ats_package/geos_ats/helpers/restart_check.py

@@ -6,6 +6,7 @@
 import re
 import argparse
 import logging
+import time
 from pathlib import Path
 try:
     from geos_ats.helpers.permute_array import permuteArray  # type: ignore[import]
@@ -31,6 +32,36 @@ def write( output, msg ):
     output.write( msg )
 
 
+def is_lfs_pointer( fname ):
+    res = False
+    try:
+        header = str( open( fname, 'rb' ).read( 16 ) )
+        if 'Git LFS pointer' in header:
+            res = True
+    except Exception:
+        pass
+
+    return res
+
+
+def load_hdf5( fname, max_wait_time=10, mode='r' ):
+    file = None
+    for ii in range( max_wait_time ):
+        if os.path.isfile( fname ):
+            try:
+                file = h5py.File( fname, mode )
+                logger.debug( f'Opened file: {fname}' )
+                break
+            except IOError:
+                logger.warning( f'Failed to open file: {fname} (attempt {ii+1}/{max_wait_time})' )
+                if is_lfs_pointer( fname ):
+                    raise Exception( f'Target LFS object is not initialized: {fname}' )
+
+        time.sleep( 1 )
+
+    return file
+
+
 def h5PathJoin( p1, p2 ):
     if p1 == "/":
         return "/" + p2
@@ -79,17 +110,20 @@ def __init__( self,
         assert ( self.atol >= 0.0 )
 
     def filesDiffer( self ):
-        try:
-            with h5py.File( self.file_path, "r" ) as file, h5py.File( self.baseline_path, "r" ) as base_file:
-                self.file_path = file.filename
-                self.baseline_path = base_file.filename
-                self.output.write( "\nRank %s is comparing %s with %s \n" %
-                                   ( MPI.COMM_WORLD.Get_rank(), self.file_path, self.baseline_path ) )
-                self.compareGroups( file, base_file )
-
-        except IOError as e:
-            self.logger.debug( e )
-            self.output.write( str( e ) )
+        # Check to see if the file is on the disk, and wait in case there is any lag in IO
+        file = load_hdf5( self.file_path )
+        base_file = load_hdf5( self.baseline_path )
+        rank = MPI.COMM_WORLD.Get_rank()
+        self.output.write( f"\nRank {rank} is comparing {self.file_path} with {self.baseline_path} \n" )
+
+        # Compare the files
+        if ( file is not None ) and ( base_file is not None ):
+            self.file_path = file.filename
+            self.baseline_path = base_file.filename
+            self.compareGroups( file, base_file )
+
+        else:
+            self.output.write( f"\nRank {rank} Failed to load target and/or baseline files \n" )
             self.different = True
 
         return self.different

geos_ats_package/geos_ats/test_case.py

@@ -388,10 +388,9 @@ def testRebaseline( self ):
         if config.rebaseline_ask:
             while 1:
                 if config.rebaseline_undo:
-                    logger.info( f"Are you sure you want to undo the rebaseline for TestCase '{self.name}'?",
-                                 flush=True )
+                    logger.info( f"Are you sure you want to undo the rebaseline for TestCase '{self.name}'?" )
                 else:
-                    logger.info( f"Are you sure you want to rebaseline TestCase '{self.name}'?", flush=True )
+                    logger.info( f"Are you sure you want to rebaseline TestCase '{self.name}'?" )
 
                 x = input( '[y/n] ' )
                 x = x.strip()