From 0a6fa679d989a5421722df3c43379ffa63c2f8f6 Mon Sep 17 00:00:00 2001 From: Keith Bennett Date: Fri, 6 Sep 2024 12:46:45 +0100 Subject: [PATCH 1/3] Updated SDF submodule SDF/C - Open file with binary-mode flag - Fix compilation using mingw - Add dynamic library loading for Windows - Add missing S_ISDIR/S_ISREG macros - Used the "dll" suffix on Windows - Fix separator for SDF_EXTENSION_PATH in Windows - Replace a shell script with a CMake script - Fix build flags when using Microsoft Visual C - Use a more portable method for compiling postion-independent code - Fix compilation with Visual C - Fix paths when running in Windows - Remove commented-out code - Fix SDFCConfig.cmake - Fix bug when generating cartesian grid from spherical - Update the version number - Use the more portable int64_t type instead of off_t - Update the version number - Fix for segfaults when reading the CPU-split grid - Removed obsolete MPI_LB/UB types - Update the version number - Prevent segfault when adding derived blocks - Prevent calling sdf_extension_free on NULL handle - Update the version number SDF/FORTRAN - Add '--diff-branch' option to pack.py - Forbid some buggy versions of open-mpi - Fix pack.cmake when paths can have spaces - Call subprocess.call in a portable manner - Specify which Python exceptions are handled - Add whitespace to stop complaints from PEP8 linters - Fix pack_git_diff option - Allow a project to specify the pack target as PRE_BUILD - Forbid some buggy versions of open-mpi - Install a version file for the PackSDF CMake package - Add missing file to packed source code - Add flag to only write diff to SDF - Fix generation of git-diff for packing into SDF - Fixed pack script for non-ascii characters - Use "with open() as" in pack script - Add routine to test if embedded source can be written - Fixed initialisation of SDF filehandle - Add header to embedded git-diff results - Fix parsing of branch name in git-diff header - Require Python 3.6 or newer for pack.py - Stop a whitespace complaint from PEP8 linters - Require git version >=2.7 - Handle spaces in file system paths - Add some procedure interfaces that accept MPI Fortran 2008 types - Compile the MPI Fortran 2008 interfaces conditionally - Fix the version of Python found by src/pack.sh - Work around an issue with pgfortran, openmpi and mpi_f08 - Restore previous file name extensions - Add a test case to check if sdf_f08 is available - Allow the user to indicate that sdf_f08 is not expected - Force the local PackSDF scripts to be used - Force SDF-sdf_f08-available to be run in serial - Remove an incorrect compiler option - Fix builds with gfortran >= 10 and MPICH <= 4.0.2 - Fix SDFConfig.cmake - Revert renamed F90 extension in Makefiles - Whitespace fixes - Removed unused variables - Handle writing of empty arrays - Prevent divide-by-zero in sdf_station_seek_time - Update the version number - Add some subroutines for reading and writing 4D arrays - Rename a local variable to avoid a name clash - Update the version number SDF/utilities - Fixed call to add_subplot that now has changed behaviour - Use "stat" instead of "lstat" to support mingw - Don't link against libdl when cross-compiling - Update version numbers - Exclude static libraries from installation - Generate source files in a portable manner - Build getopt.dll on Windows hosts - Fix compilation of sdffilter and sdfdiff with Visual C - Fix paths required for building sdfpy - Build and install Python wheel files for packaging with CPack - Move the location of the egg-info directory - Fix compilation of sdfpy with Visual C - Install required system libraries - Package with CPack - Fix installation of sdf_legacy.py - Convert maps to lists - Workaround bug when block has an invalid datatype - Install as a CMake package - Avoid a warning from CMake - Add an error trap in CMakeLists.txt - Update the version number - Bump the minimum required CMake version - Fail at configure time if Python.h is unavailable - Use find_package to find sdfc - Fix portability issues when building in Windows - Update the version number - Fix the build system for recent versions of Python - Fix LICENSE to be BSD-3 - Update the version number - Update version information in all locations - Fix python build to work on github workflows - Fix build of python module in github workflow environment - Add workflow for testing build of modules SDF/VisIt - Don't use strndup - Ignore files created by Visual Studio builds - Add scripts for building with different versions of Microsoft Visual Studio - Add scripts for generating source files in a portable manner - Update version number --- SDF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDF b/SDF index 4c895c7fe..330c692e7 160000 --- a/SDF +++ b/SDF @@ -1 +1 @@ -Subproject commit 4c895c7fe848f27aa47da2787b26b5e470f0da0c +Subproject commit 330c692e7c89efe75c4b396b8fa877409e4dc220 From f9310772f32010578a32df6021ac512c8cad68b0 Mon Sep 17 00:00:00 2001 From: Keith Bennett Date: Fri, 6 Sep 2024 11:30:13 +0100 Subject: [PATCH 2/3] Update Makefiles to use new sdfutils build.sh script --- epoch1d/Makefile | 4 ++-- epoch2d/Makefile | 4 ++-- epoch3d/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epoch1d/Makefile b/epoch1d/Makefile index 2a53d7dcd..cbd55c630 100644 --- a/epoch1d/Makefile +++ b/epoch1d/Makefile @@ -420,11 +420,11 @@ visitclean: sdfutils: @cd $(SDF)/../C; make - @cd $(SDF)/../utilities; ./build + @cd $(SDF)/../utilities; ./build.sh sdfutilsclean: @cd $(SDF)/../C; make clean - @cd $(SDF)/../utilities; ./build -c + @cd $(SDF)/../utilities; ./build.sh -c sdf_reader_example: $(BINDIR)/sdf_reader_example diff --git a/epoch2d/Makefile b/epoch2d/Makefile index 208fee85f..8e57b9af4 100644 --- a/epoch2d/Makefile +++ b/epoch2d/Makefile @@ -420,11 +420,11 @@ visitclean: sdfutils: @cd $(SDF)/../C; make - @cd $(SDF)/../utilities; ./build + @cd $(SDF)/../utilities; ./build.sh sdfutilsclean: @cd $(SDF)/../C; make clean - @cd $(SDF)/../utilities; ./build -c + @cd $(SDF)/../utilities; ./build.sh -c sdf_reader_example: $(BINDIR)/sdf_reader_example diff --git a/epoch3d/Makefile b/epoch3d/Makefile index a55f82309..f54b60bf2 100644 --- a/epoch3d/Makefile +++ b/epoch3d/Makefile @@ -420,11 +420,11 @@ visitclean: sdfutils: @cd $(SDF)/../C; make - @cd $(SDF)/../utilities; ./build + @cd $(SDF)/../utilities; ./build.sh sdfutilsclean: @cd $(SDF)/../C; make clean - @cd $(SDF)/../utilities; ./build -c + @cd $(SDF)/../utilities; ./build.sh -c sdf_reader_example: $(BINDIR)/sdf_reader_example From c88f11b9d57d742d110ad015f9f500ce48bc7254 Mon Sep 17 00:00:00 2001 From: Keith Bennett Date: Fri, 6 Sep 2024 13:08:45 +0100 Subject: [PATCH 3/3] Update test script to use new sdfutils build.sh --- scripts/run-tests-epoch-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests-epoch-all.sh b/scripts/run-tests-epoch-all.sh index 01c619ac0..b9dd05a3d 100755 --- a/scripts/run-tests-epoch-all.sh +++ b/scripts/run-tests-epoch-all.sh @@ -52,7 +52,7 @@ fi # Build SDF/C and install python sdf reader (cd SDF/C; make) -SDF/utilities/build $FLG +SDF/utilities/build.sh $FLG # show system info scripts/system_info.sh