From a8b69d8172095d61f86ee013562347a1f5267d4c Mon Sep 17 00:00:00 2001 From: Spiros Tsalikis Date: Tue, 12 Sep 2023 14:55:11 -0400 Subject: [PATCH] Delete experimental examples They are no longer compiling, and nobody has ever used them over the past 5 years. --- CMakeLists.txt | 1 - bindings/Matlab/README.txt | 2 +- examples/CMakeLists.txt | 3 - examples/experimental/CMakeLists.txt | 6 - .../experimental/runtimeconfig/CMakeLists.txt | 1 - .../runtimeconfig/configs/grandSchema.xml | 76 ------------ .../configs/multipleIOResolutions.xml | 24 ---- .../configs/multipleTransformedVariables.xml | 26 ---- .../runtimeconfig/hello/CMakeLists.txt | 13 -- .../runtimeconfig/hello/helloBPWriter.xml | 26 ---- .../runtimeconfig/hello/helloBPWriterXML.cpp | 112 ------------------ .../runtimeconfig/hello/helloBPWriterXML.py | 36 ------ .../hello/helloBPWriterXML_nompi.cpp | 93 --------------- .../hello/helloBPWriterXML_nompi.py | 30 ----- scripts/runconf/runconf_olcf.sh | 3 - 15 files changed, 1 insertion(+), 451 deletions(-) delete mode 100644 examples/experimental/CMakeLists.txt delete mode 100644 examples/experimental/runtimeconfig/CMakeLists.txt delete mode 100644 examples/experimental/runtimeconfig/configs/grandSchema.xml delete mode 100644 examples/experimental/runtimeconfig/configs/multipleIOResolutions.xml delete mode 100644 examples/experimental/runtimeconfig/configs/multipleTransformedVariables.xml delete mode 100644 examples/experimental/runtimeconfig/hello/CMakeLists.txt delete mode 100644 examples/experimental/runtimeconfig/hello/helloBPWriter.xml delete mode 100644 examples/experimental/runtimeconfig/hello/helloBPWriterXML.cpp delete mode 100644 examples/experimental/runtimeconfig/hello/helloBPWriterXML.py delete mode 100644 examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.cpp delete mode 100644 examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py diff --git a/CMakeLists.txt b/CMakeLists.txt index f0f6941024..d3f223ed14 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -319,7 +319,6 @@ add_subdirectory(plugins) # Examples #------------------------------------------------------------------------------# option(ADIOS2_BUILD_EXAMPLES "Build examples" ON) -option(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL "Build experimental examples" OFF) if(ADIOS2_BUILD_EXAMPLES) add_subdirectory(examples) endif() diff --git a/bindings/Matlab/README.txt b/bindings/Matlab/README.txt index 4c43c89ffe..7f19136624 100644 --- a/bindings/Matlab/README.txt +++ b/bindings/Matlab/README.txt @@ -43,5 +43,5 @@ $ cd $ git pull $ mkdir build.lean $ cd build.lean -$ cmake -DCMAKE_INSTALL_PREFIX=/opt/adios/lean -DADIOS2_USE_MPI=OFF -DADIOS2_USE_Fortran=OFF -DADIOS2_USE_Python=OFF -DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DADIOS2_ENABLE_PIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TESTING=OFF -DADIOS2_USE_SST=OFF -DADIOS2_USE_BZip2=OFF -DADIOS2_USE_DataMan=OFF .. +$ cmake -DCMAKE_INSTALL_PREFIX=/opt/adios/lean -DADIOS2_USE_MPI=OFF -DADIOS2_USE_Fortran=OFF -DADIOS2_USE_Python=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DADIOS2_ENABLE_PIC=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_TESTING=OFF -DADIOS2_USE_SST=OFF -DADIOS2_USE_BZip2=OFF -DADIOS2_USE_DataMan=OFF .. diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e14d76bb05..3187dc3f49 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -15,9 +15,6 @@ if(ADIOS2_HAVE_MPI) add_subdirectory(heatTransfer) endif() -if(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL) - add_subdirectory(experimental) -endif() if(ADIOS2_HAVE_CUDA OR ADIOS2_HAVE_Kokkos_CUDA) add_subdirectory(cuda) diff --git a/examples/experimental/CMakeLists.txt b/examples/experimental/CMakeLists.txt deleted file mode 100644 index 23240d2bae..0000000000 --- a/examples/experimental/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -#------------------------------------------------------------------------------# -# Distributed under the OSI-approved Apache License, Version 2.0. See -# accompanying file Copyright.txt for details. -#------------------------------------------------------------------------------# - -add_subdirectory(runtimeconfig) diff --git a/examples/experimental/runtimeconfig/CMakeLists.txt b/examples/experimental/runtimeconfig/CMakeLists.txt deleted file mode 100644 index 33bde8ad15..0000000000 --- a/examples/experimental/runtimeconfig/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -add_subdirectory(hello) diff --git a/examples/experimental/runtimeconfig/configs/grandSchema.xml b/examples/experimental/runtimeconfig/configs/grandSchema.xml deleted file mode 100644 index 71d80bd30b..0000000000 --- a/examples/experimental/runtimeconfig/configs/grandSchema.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - BlockSize100K=3; - - - Tolerance=1e-3; - - - - - - - Threads=4; - Verbose=4; - ProfileUnits=Microseconds; - MaxBufferSize=20Mb; - InitialBufferSize=1Mb; - BufferGrowthFactor=2; - - - - ProfileUnits=Microseconds; - Library=stdio; - CacheSize=8192; - CollectiveMetadata=Yes; - - - - ProfileUnits=Microseconds; - Library=hdf5; - Name=data.h5; - - - - ProfileUnits=Microseconds; - Library=SystemV; - Name=data.shmem; - SetSize=10Mb; - - - - ProfileUnits=Microseconds; - Library=POSIX; - Name=/bb_location/data.bb; - SetSize=10Mb; - - - - ProfileUnits=Microseconds; - IPAddress=128.219.4.85; - Port=500; - Library=zmq; - CacheSize=8192; - - - - ProfileUnits=Microseconds; - Library=ibverbs; - Port=18515; - IBPort=1; - SetSize=1Mb; - TXDepth=100; - SocketFD=-1; - ServerName=NULL; - RemoteConnection=NULL; - IBDev=NULL; - - - - - \ No newline at end of file diff --git a/examples/experimental/runtimeconfig/configs/multipleIOResolutions.xml b/examples/experimental/runtimeconfig/configs/multipleIOResolutions.xml deleted file mode 100644 index 28fe854084..0000000000 --- a/examples/experimental/runtimeconfig/configs/multipleIOResolutions.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Tolerance=1e-2; - - - - - - - - - - Tolerance=1e-5; - - - - - - - \ No newline at end of file diff --git a/examples/experimental/runtimeconfig/configs/multipleTransformedVariables.xml b/examples/experimental/runtimeconfig/configs/multipleTransformedVariables.xml deleted file mode 100644 index 8338320d5c..0000000000 --- a/examples/experimental/runtimeconfig/configs/multipleTransformedVariables.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - Tolerance=1e-2; - - - - - - - - - - - Tolerance=1e-5; - - - - - - - - - diff --git a/examples/experimental/runtimeconfig/hello/CMakeLists.txt b/examples/experimental/runtimeconfig/hello/CMakeLists.txt deleted file mode 100644 index dac3c8499f..0000000000 --- a/examples/experimental/runtimeconfig/hello/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_executable(helloBPWriterXML helloBPWriterXML_nompi.cpp) -target_link_libraries(helloBPWriterXML adios2::cxx11) -target_compile_definitions(helloBPWriterXML PRIVATE - -DDEFAULT_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/helloBPWriter.xml -) - -if(ADIOS2_HAVE_MPI) - add_executable(helloBPWriterXML_mpi helloBPWriterXML.cpp) - target_link_libraries(helloBPWriterXML_mpi adios2::cxx11_mpi MPI::MPI_C) - target_compile_definitions(helloBPWriterXML_mpi PRIVATE - -DDEFAULT_CONFIG=${CMAKE_CURRENT_SOURCE_DIR}/helloBPWriter.xml - ) -endif() diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriter.xml b/examples/experimental/runtimeconfig/hello/helloBPWriter.xml deleted file mode 100644 index 27a01d5db8..0000000000 --- a/examples/experimental/runtimeconfig/hello/helloBPWriter.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriterXML.cpp b/examples/experimental/runtimeconfig/hello/helloBPWriterXML.cpp deleted file mode 100644 index f6634b8ac4..0000000000 --- a/examples/experimental/runtimeconfig/hello/helloBPWriterXML.cpp +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Distributed under the OSI-approved Apache License, Version 2.0. See - * accompanying file Copyright.txt for details. - * - * helloBPWriter.cpp: Simple self-descriptive example of how to write a variable - * to a BP File that lives in several MPI processes. - * - * Created on: Feb 16, 2017 - * Author: William F Godoy godoywf@ornl.gov - */ - -#include //std::ios_base::failure -#include //std::cout -#include -#include //std::invalid_argument std::exception -#include - -#include - -#define str_helper(X) #X -#define str(X) str_helper(X) - -#ifndef DEFAULT_CONFIG -#define DEFAULT_CONFIG helloBPWriter.xml -#endif -#define DEFAULT_CONFIG_STR str(DEFAULT_CONFIG) - -int main(int argc, char *argv[]) -{ - int provided; - - // MPI_THREAD_MULTIPLE is only required if you enable the SST MPI_DP - MPI_Init_thread(&argc, &argv, MPI_THREAD_MULTIPLE, &provided); - int rank, size; - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - MPI_Comm_size(MPI_COMM_WORLD, &size); - - std::string configFile; - if (argc == 1) - { - configFile = DEFAULT_CONFIG_STR; - } - else if (argc == 2) - { - configFile = argv[1]; - } - else - { - if (rank == 0) - { - std::cerr << "Usage: " << argv[0] << " [/path/to/config.xml]" << std::endl; - } - return 1; - } - if (rank == 0) - { - std::cout << "Using config file: " << configFile << std::endl; - } - - /** Application variable */ - std::vector myFloats = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - const std::size_t Nx = myFloats.size(); - - try - { - /** ADIOS class factory of IO class objects */ - adios2::ADIOS adios(configFile, MPI_COMM_WORLD); - - /*** IO class object: settings and factory of Settings: Variables, - * Parameters, Transports, and Execution: Engines */ - adios2::IO bpIO = adios.DeclareIO("BPFile_N2N"); - - /** global array : name, { shape (total) }, { start (local) }, { count - * (local) }, all are constant dimensions */ - adios2::Variable &bpFloats = bpIO.DefineVariable( - "bpFloats", {size * Nx}, {rank * Nx}, {Nx}, adios2::ConstantDims); - - /** Engine derived class, spawned to start IO operations */ - auto bpWriter = bpIO.Open("myVector.bp", adios2::Mode::Write); - - if (!bpWriter) - { - throw std::ios_base::failure("ERROR: bpWriter not created at Open\n"); - } - - /** Write variable for buffering */ - bpWriter->Write(bpFloats, myFloats.data()); - - /** Create bp file, engine becomes unreachable after this*/ - bpWriter->Close(); - } - catch (std::invalid_argument &e) - { - std::cout << "Invalid argument exception, STOPPING PROGRAM from rank " << rank << "\n"; - std::cout << e.what() << "\n"; - } - catch (std::ios_base::failure &e) - { - std::cout << "IO System base failure exception, STOPPING PROGRAM from rank " << rank - << "\n"; - std::cout << e.what() << "\n"; - } - catch (std::exception &e) - { - std::cout << "Exception, STOPPING PROGRAM from rank " << rank << "\n"; - std::cout << e.what() << "\n"; - } - - MPI_Finalize(); - - return 0; -} diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py b/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py deleted file mode 100644 index a4c2c4b6b0..0000000000 --- a/examples/experimental/runtimeconfig/hello/helloBPWriterXML.py +++ /dev/null @@ -1,36 +0,0 @@ -# -# Distributed under the OSI-approved Apache License, Version 2.0. See -# accompanying file Copyright.txt for details. -# -# helloBPWriterXML.py -# Created on: Feb 2, 2017 -# Author: William F Godoy godoywf@ornl.gov - -from mpi4py import MPI -import adios2 -import numpy - -# MPI -comm = MPI.COMM_WORLD -rank = comm.Get_rank() -size = comm.Get_size() - -# User data -myArray = numpy.array([0., 1., 2., 3., 4., 5., 6., 7., 8., 9.]) -Nx = myArray.size - -# ADIOS config file, MPI communicator -adios = adios2.ADIOS("helloBPWriter.xml", comm) - -# ADIOS IO, name must be the same as in helloBPWriter.xml for runtime settings -bpIO = adios.DeclareIO("BPFile_N2N") - -# Variable name, shape, start, count, ConstantDims = True -ioArray = bpIO.DefineVariable( - "bpArray", [size * Nx], [rank * Nx], [Nx], adios2.ConstantDims) - -# Engine name, open mode -bpFileWriter = bpIO.Open("npArray.bp", adios2.OpenModeWrite) -# Write variable, numpy object -bpFileWriter.Write(ioArray, myArray) -bpFileWriter.Close() diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.cpp b/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.cpp deleted file mode 100644 index 07f5bedc19..0000000000 --- a/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.cpp +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Distributed under the OSI-approved Apache License, Version 2.0. See - * accompanying file Copyright.txt for details. - * - * helloBPWriterXML_nompi.cpp: sequential non-mpi version of helloBPWriterXML - * - * Created on: Feb 16, 2017 - * Author: William F Godoy godoywf@ornl.gov - */ - -#include //std::ios_base::failure -#include //std::cout -#include //std::invalid_argument std::exception -#include - -#include - -#define str_helper(X) #X -#define str(X) str_helper(X) - -#ifndef DEFAULT_CONFIG -#define DEFAULT_CONFIG helloBPWriter.xml -#endif -#define DEFAULT_CONFIG_STR str(DEFAULT_CONFIG) - -int main(int argc, char *argv[]) -{ - std::string configFile; - if (argc == 1) - { - configFile = DEFAULT_CONFIG_STR; - } - else if (argc == 2) - { - configFile = argv[1]; - } - else - { - std::cerr << "Usage: " << argv[0] << " [/path/to/config.xml]" << std::endl; - return 1; - } - std::cout << "Using config file: " << configFile << std::endl; - - /** Application variable */ - std::vector myFloats = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; - const std::size_t Nx = myFloats.size(); - - try - { - /** ADIOS class factory of IO class objects */ - adios2::ADIOS adios(configFile); - - /*** IO class object: settings and factory of Settings: Variables, - * Parameters, Transports, and Execution: Engines */ - adios2::IO bpIO = adios.DeclareIO("BPFile_N2N"); - - /** global array : name, { shape (total) }, { start (local) }, { count - * (local) }, all are constant dimensions */ - adios2::Variable &bpFloats = - bpIO.DefineVariable("bpFloats", {}, {}, {Nx}, adios2::ConstantDims); - - /** Engine derived class, spawned to start IO operations */ - auto bpWriter = bpIO.Open("myVector.bp", adios2::Mode::Write); - - if (!bpWriter) - { - throw std::ios_base::failure("ERROR: bpWriter not created at Open\n"); - } - - /** Write variable for buffering */ - bpWriter->Write(bpFloats, myFloats.data()); - - /** Create bp file, engine becomes unreachable after this*/ - bpWriter->Close(); - } - catch (std::invalid_argument &e) - { - std::cout << "Invalid argument exception, STOPPING PROGRAM\n"; - std::cout << e.what() << "\n"; - } - catch (std::ios_base::failure &e) - { - std::cout << "IO System base failure exception, STOPPING PROGRAM\n"; - std::cout << e.what() << "\n"; - } - catch (std::exception &e) - { - std::cout << "Exception, STOPPING PROGRAM from rank\n"; - std::cout << e.what() << "\n"; - } - - return 0; -} diff --git a/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py b/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py deleted file mode 100644 index 2ef26916ea..0000000000 --- a/examples/experimental/runtimeconfig/hello/helloBPWriterXML_nompi.py +++ /dev/null @@ -1,30 +0,0 @@ -# -# Distributed under the OSI-approved Apache License, Version 2.0. See -# accompanying file Copyright.txt for details. -# -# helloBPWriterXML_nompi.py serial non-MPI version of helloBPWriter.py -# Created on: Feb 2, 2017 -# Author: William F Godoy godoywf@ornl.gov - -import numpy -import adios2 - - -# User data -myArray = numpy.array([0., 1., 2., 3., 4., 5., 6., 7., 8., 9.]) -Nx = myArray.size - -# ADIOS config file -adios = adios2.ADIOS("helloBPWriter.xml") - -# ADIOS IO, name must be the same as in helloBPWriter.xml for runtime settings -bpIO = adios.DeclareIO("BPFile_N2N") - -# ADIOS local array: Variable name, shape, start, offset -ioArray = bpIO.DefineVariable( - "bpArray", [], [], [Nx], adios2.ConstantDims) - -# ADIOS Engine -bpFileWriter = bpIO.Open("npArray.bp", adios2.OpenModeWrite) -bpFileWriter.Write(ioArray, myArray) -bpFileWriter.Close() diff --git a/scripts/runconf/runconf_olcf.sh b/scripts/runconf/runconf_olcf.sh index 3d1ea83bc9..a9fc163f5d 100644 --- a/scripts/runconf/runconf_olcf.sh +++ b/scripts/runconf/runconf_olcf.sh @@ -66,7 +66,6 @@ if [ `hostname | cut -c 1-5` == "titan" ]; then -DADIOS2_USE_MPI=${USE_MPI} \ -DADIOS2_USE_Fortran=ON \ -DADIOS2_USE_Python=OFF \ - -DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_TESTING=OFF \ ${EXTERNAL_OPTS} \ @@ -116,7 +115,6 @@ elif [ `hostname -f | cut -c 1-9` == "summitdev" ]; then -DADIOS2_USE_MPI=${USE_MPI} \ -DADIOS2_USE_Fortran=ON \ -DADIOS2_USE_Python=OFF \ - -DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF \ -DCMAKE_BUILD_TYPE=Debug \ -DBUILD_TESTING=ON \ -DADIOS2_USE_DataMan=OFF \ @@ -154,7 +152,6 @@ elif [ `hostname -f | cut -c 1-4` == "rhea" ]; then -DADIOS2_USE_Fortran=ON \ -DADIOS2_USE_Python=OFF \ -DADIOS2_USE_SST=OFF \ - -DADIOS2_BUILD_EXAMPLES_EXPERIMENTAL=OFF \ -DCMAKE_BUILD_TYPE=Debug \ -DBUILD_TESTING=ON \ -DADIOS2_USE_DataMan=OFF \