zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update parallelio from NOAA-EMC fork (#34837)

Browse Source
This commit is contained in:
Alex Richert 2023-01-23 13:29:06 -08:00 committed by GitHub
parent 0f2e0a01a9
commit beba33b2d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
var/spack/repos/builtin/packages/parallelio/package.py
View File

@ -18,19 +18,24 @@ class Parallelio(CMakePackage):
maintainers = ["jedwards4b"]
version("2.5.9", sha256="e5dbc153d8637111de3a51a9655660bf15367d55842de78240dcfc024380553d")
version("2_5_8", sha256="f2584fb4310ff7da39d51efbe3f334efd0ac53ae2995e5fc157decccc0570a89")
version("2_5_7", sha256="af8af04e41af17f98f2c90b996ef0d8bcd980377e0b35e57b38938c7fdc87cbd")
version("2_5_4", sha256="e51dc71683da808a714deddc1a80c2650ce847110383e42f1710f3ba567e7a65")
version("2_5_2", sha256="935bc120ef3bf4fe09fb8bfdf788d05fb201a125d7346bf6b09e27ac3b5f345c")
version("2.5.8", sha256="f2584fb4310ff7da39d51efbe3f334efd0ac53ae2995e5fc157decccc0570a89")
version("2.5.7", sha256="af8af04e41af17f98f2c90b996ef0d8bcd980377e0b35e57b38938c7fdc87cbd")
version("2.5.4", sha256="e51dc71683da808a714deddc1a80c2650ce847110383e42f1710f3ba567e7a65")
version("2.5.3", sha256="205a0a128fd5262700efc230b3380dc5ab10e74bc5d273ae05db76c9d95487ca")
version("2.5.2", sha256="935bc120ef3bf4fe09fb8bfdf788d05fb201a125d7346bf6b09e27ac3b5f345c")
variant("pnetcdf", default=False, description="enable pnetcdf")
variant("timing", default=False, description="enable GPTL timing")
variant("shared", default=True, description="Build shared libraries")
variant("logging", default=False, description="enable verbose logging")
variant(
"fortran", default=True, description="enable fortran interface (requires netcdf fortran)"
)
variant("mpi", default=True, description="Use mpi to build, otherwise use mpi-serial")
patch("remove_redefinition_of_mpi_offset.patch", when="@:2.5.6")
depends_on("cmake@3.7:", type="build")
depends_on("mpi", when="+mpi")
depends_on("mpi-serial", when="~mpi")
depends_on("netcdf-c +mpi", type="link", when="+mpi")
@ -38,11 +43,11 @@ class Parallelio(CMakePackage):
depends_on("netcdf-fortran", type="link", when="+fortran")
depends_on("parallel-netcdf", type="link", when="+pnetcdf")
resource(name="genf90", git="https://github.com/PARALLELIO/genf90.git", tag="genf90_200608")
# Allow argument mismatch in gfortran versions > 10 for mpi library compatibility
patch("gfortran.patch", when="@:2.5.8 +fortran %gcc@10:")
resource(name="genf90", git="https://github.com/PARALLELIO/genf90.git", tag="genf90_200608")
def cmake_args(self):
define = self.define
define_from_variant = self.define_from_variant
@ -51,9 +56,10 @@ def cmake_args(self):
args = [
define("NetCDF_C_PATH", spec["netcdf-c"].prefix),
define("USER_CMAKE_MODULE_PATH", join_path(src, "cmake")),
define("NetCDF_Fortran_PATH", spec["netcdf-fortran"].prefix),
define("USER_CMAKE_MODULE_PATH", join_path(src, "CMake_Fortran_utils")),
define("GENF90_PATH", join_path(src, "genf90")),
define("BUILD_SHARED_LIBS", True),
define_from_variant("BUILD_SHARED_LIBS", "shared"),
define("PIO_ENABLE_EXAMPLES", False),
]
if spec.satisfies("+pnetcdf"):

35
var/spack/repos/builtin/packages/parallelio/remove_redefinition_of_mpi_offset.patch Normal file
View File

@ -0,0 +1,35 @@
--- a/src/clib/pio_internal.h
+++ b/src/clib/pio_internal.h
@@ -30,12 +30,12 @@
#include <mpe.h>
#endif /* USE_MPE */
-#ifndef MPI_OFFSET
+//#ifndef MPI_OFFSET
/** MPI_OFFSET is an integer type of size sufficient to represent the
* size (in bytes) of the largest file supported by MPI. In some MPI
* implementations MPI_OFFSET is not properly defined. */
-#define MPI_OFFSET MPI_LONG_LONG
-#endif
+//#define MPI_OFFSET MPI_LONG_LONG
+//#endif
/* These are the sizes of types in netCDF files. Do not replace these
* constants with sizeof() calls for C types. They are not the
@@ -57,10 +57,10 @@
#define MPI_OFFSET OMPI_OFFSET_DATATYPE
#endif
#endif
-#ifndef MPI_Offset
+//#ifndef MPI_Offset
/** This is the type used for PIO_Offset. */
-#define MPI_Offset long long
-#endif
+//#define MPI_Offset long long
+//#endif
/** Some MPI implementations do not allow passing MPI_DATATYPE_NULL to
* comm functions even though the send or recv length is 0, in these
--
2.34.1