Unverified Commit d8e8822a authored by Bolea Sanchez, Vicente Adolfo's avatar Bolea Sanchez, Vicente Adolfo Committed by GitHub
Browse files

Merge pull request #4378 from vicentebolea/prepare-release-branch 

Prepare release branch
parents f20747e7 c23b428a

source/adios2/common/ADIOSTypes.h

+0 −43
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <complex>

#include <limits>

#include <map>

#include <memory>

#include <string>

#include <type_traits>

#include <utility> //std::pair
@@ -385,48 +384,6 @@ struct UserOptions 
    SST sst;

};



/** Host access protocols */

enum class HostAccessProtocol

{

    Invalid,

    SSH,

    XRootD,

    S3

};



/** Host authentication protocols */

enum class HostAuthProtocol

{

    Invalid,

    Password,

    X509

};



struct HostConfig

{

    std::string name; // Connection Option name

    HostAccessProtocol protocol = HostAccessProtocol::Invalid;



    /* ssh and xrootd parameters */

    uint16_t port = 0;

    uint16_t localPort = 0;

    std::string hostname = "";

    std::string username = "";

    std::string remoteServerPath = "";

    HostAuthProtocol authentication = HostAuthProtocol::Invalid;



    /* s3 parameters */

    std::string endpoint = "";

    std::string awsProfile = "default"; // profile name in ~/.aws/credentials

    bool isAWS_EC2 = false;

    bool recheckMetadata = true;



    int verbose = 0;

};



/** HostOptions holds all user options from ~/.config/adios2/hosts.yaml */

using HostOptions = std::map<std::string, std::vector<HostConfig>>;



/**

 * os << [adios2_type] enables output of adios2 enums/classes directly

 * to output streams (e.g. std::cout), if ToString() can handle [adios2_type].

source/adios2/core/ADIOS.cpp

+0 −20
Original line number Diff line number Diff line
@@ -110,9 +110,6 @@ static std::atomic_uint adios_count(0); // total adios objects during runtime 
/** User defined options from ~/.config/adios2/adios2.yaml if it exists */

const adios2::UserOptions &ADIOS::GetUserOptions() { return m_UserOptions; };



/** A constant reference to the host options from ~/.config/adios2/hosts.yaml */

const adios2::HostOptions &ADIOS::GetHostOptions() { return m_HostOptions; };



ADIOS::ADIOS(const std::string configFile, helper::Comm comm, const std::string hostLanguage)

: m_HostLanguage(hostLanguage), m_Comm(std::move(comm)), m_ConfigFile(configFile),

  m_CampaignManager(m_Comm)
@@ -132,7 +129,6 @@ ADIOS::ADIOS(const std::string configFile, helper::Comm comm, const std::string 
    }

#endif

    ProcessUserConfig();

    ProcessHostConfig();

    if (!configFile.empty())

    {

        if (!adios2sys::SystemTools::FileExists(configFile))
@@ -215,22 +211,6 @@ void ADIOS::ProcessUserConfig() 
    }

}



void ADIOS::ProcessHostConfig()

{

    // read config parameters from config file

    std::string homePath;

#ifdef _WIN32

    homePath = getenv("HOMEPATH");

#else

    homePath = getenv("HOME");

#endif

    const std::string cfgFile = homePath + "/.config/adios2/hosts.yaml";

    if (adios2sys::SystemTools::FileExists(cfgFile))

    {

        helper::ParseHostOptionsFile(m_Comm, cfgFile, m_HostOptions, homePath);

    }

}



IO &ADIOS::DeclareIO(const std::string name, const ArrayOrdering ArrayOrder)

{

    auto itIO = m_IOs.find(name);

source/adios2/core/ADIOS.h

+0 −6
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ public: 
    /** A constant reference to the user options from ~/.config/adios2/adios2.yaml */

    const adios2::UserOptions &GetUserOptions();



    /** A constant reference to the host options from ~/.config/adios2/hosts.yaml */

    const adios2::HostOptions &GetHostOptions();



private:

    /** Communicator given to parallel constructor. */

    helper::Comm m_Comm;
@@ -211,11 +208,8 @@ private: 
                    core::IO &io);



    adios2::UserOptions m_UserOptions;

    adios2::HostOptions m_HostOptions;

    adios2::HostConfig m_Test;

    void SetUserOptionDefaults();

    void ProcessUserConfig();

    void ProcessHostConfig();



private:

    /* Global services that we want to initialize at most once and shutdown

source/adios2/core/Engine.cpp

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ namespace core 
Engine::Engine(const std::string engineType, IO &io, const std::string &name, const Mode openMode,

               helper::Comm comm)

: m_EngineType(engineType), m_IO(io), m_Name(name), m_OpenMode(openMode), m_Comm(std::move(comm)),

  m_UserOptions(io.m_ADIOS.GetUserOptions()), m_HostOptions(io.m_ADIOS.GetHostOptions())

  m_UserOptions(io.m_ADIOS.GetUserOptions())

{

    m_FailVerbose = (m_Comm.Rank() == 0);

}

source/adios2/core/Engine.h

+0 −3
Original line number Diff line number Diff line
@@ -508,9 +508,6 @@ protected: 
    /** User options parsed by the ADIOS object, here just for easy reference */

    const UserOptions &m_UserOptions;



    /** Host options parsed by the ADIOS object, here just for easy reference */

    const HostOptions &m_HostOptions;



    /** keeps track of current advance status */

    StepStatus m_AdvanceStatus = StepStatus::OK;