Changeset 2504

Timestamp:

05/23/23 12:11:20 (17 months ago)

Author:

jderouillat

Message:

Add a comparison operator to the filesToWrite_ std::set to force the file creation ordering + Backporting of 2462, 2494 and test suite environment for RedHat8

Location:

XIOS3/dev/XIOS_ATTACHED

Files:

• src/manager/pool_ressource.cpp (modified) (1 diff)
• src/manager/token_manager.hpp (modified) (2 diffs)
• src/node/context.hpp (modified) (2 diffs)
• src/node/file.hpp (modified) (1 diff)
• xios_test_suite/ARCH/arch-X64_IRENE.env (modified) (1 diff)
• xios_test_suite/ARCH/arch-X64_IRENE_GNU.env (modified) (1 diff)
• xios_test_suite/ARCH/arch-X64_IRENE_LLVM.env (modified) (1 diff)

XIOS3/dev/XIOS_ATTACHED/src/manager/pool_ressource.cpp

@@ -26 +26 @@
     }
     
+    notifyType_=NOTIFY_NOTHING;
     winNotify_->lockWindow(commRank,0) ;
     winNotify_->updateToWindow(commRank, this, &CPoolRessource::notificationsDumpOut) ;

XIOS3/dev/XIOS_ATTACHED/src/manager/token_manager.hpp

@@ -19 +19 @@
         MPI_Aint size = 0 ;
         if (leader_== commRank) size = sizeof(size_t) ;
-        MPI_Win_create(&currentToken_, size, sizeof(size_t), MPI_INFO_NULL, comm, &winCurrentToken_) ;
-        MPI_Win_create(&retrievedToken_, size, sizeof(size_t), MPI_INFO_NULL, comm, &winRetrievedToken_) ;
+        const MPI_Aint windowSize=sizeof(size_t); 
+        MPI_Win_allocate(windowSize, 1, MPI_INFO_NULL, comm, &winBufferCurrent_,   &winCurrentToken_) ;
+        MPI_Win_allocate(windowSize, 1, MPI_INFO_NULL, comm, &winBufferRetrieved_, &winRetrievedToken_) ; 
       }
 
@@ -59 +60 @@
       MPI_Win winCurrentToken_ ;
       MPI_Win winRetrievedToken_ ;
-      
+      void* winBufferCurrent_ ; 
+      void* winBufferRetrieved_ ;
+
       int leader_ ;
 

XIOS3/dev/XIOS_ATTACHED/src/node/context.hpp

@@ -15 +15 @@
 #include "server_context.hpp"
 #include "event_scheduler.hpp"
+#include "file.hpp"
 
 
@@ -299 +300 @@
         void registerFileToWrite(CFile* file) { filesToWrite_.insert(file); } // Add a file that need to be write for example to create headers
       private:  
-        std::set<CFile*> filesToWrite_ ;  
+        std::set<CFile*,FilePtrCompare> filesToWrite_ ;  
 
       private:

XIOS3/dev/XIOS_ATTACHED/src/node/file.hpp

@@ -228 +228 @@
    ///--------------------------------------------------------------
 
+   struct FilePtrCompare {
+     bool operator() (CFile const *l, CFile const *r) const {
+       return l->getFileOutputName() < r->getFileOutputName();
+     }
+   };
 } // namespace xios
 

XIOS3/dev/XIOS_ATTACHED/xios_test_suite/ARCH/arch-X64_IRENE.env

@@ -1 +1 @@
 module purge
-module load ucx/1.11.2
+module load ucx/1.12.1
 module load flavor/buildcompiler/intel/20
-module load mpi/openmpi/4.1.1
+module load mpi/openmpi/4.1.4
 
 module load flavor/hdf5/parallel
-module load netcdf-fortran/4.4.4
-module load hdf5/1.8.20
-module load gnu/11.2.0
-module load perl/5.30.2
+module load hdf5/1.12.2
+module load netcdf-fortran/4.5.3
+module load gnu/11.1.0
+module load perl/5.32.1
 
 export UCX_TLS=dc_x,cma,knem,self
+

XIOS3/dev/XIOS_ATTACHED/xios_test_suite/ARCH/arch-X64_IRENE_GNU.env

@@ -1 +1 @@
 module purge
 module load flavor/buildcompiler/gcc/8
-module load mpi/openmpi/4.0.2 
+module load mpi/openmpi/4.1.4
 
 module load flavor/hdf5/parallel
-module load netcdf-fortran/4.4.4
-module load hdf5/1.8.20
+module load hdf5/1.12.2
+module load netcdf-fortran/4.5.3
 module load gnu/8.3.0
 
-module load totalview
-module load perl/5.30.2
+module load perl/5.32.1

XIOS3/dev/XIOS_ATTACHED/xios_test_suite/ARCH/arch-X64_IRENE_LLVM.env

@@ -1 +1 @@
 module purge
-module load llvm/11.0.0
-module load mpi/openmpi/4.0.2 
+module load llvm/14.0.0
+module load mpi/openmpi/4.1.4 
 export OMPI_CC=clang
 export OMPI_CXX=clang++
 
 module load flavor/hdf5/parallel
-module load netcdf-fortran/4.4.4
-module load hdf5/1.8.20
-#module load gnu/8.3.0
+module load hdf5/1.12.2
+module load netcdf-fortran/4.5.3
+module load gnu/12.2.0
+export CPLUS_INCLUDE_PATH="${GNU_ROOT}/include/c++/12.2.0:${GNU_ROOT}/include/c++/12.2.0/x86_64-pc-linux-gnu"
 
-module load totalview
-module load perl/5.30.2
+module load perl/5.32.1