Merge pull request #1058 from eisenhauer/FFSAttributes (b09e49d4) · Commits · Podhorszki, Norbert / ADIOS2

examples/heatTransfer/heat_sst_bp_rdma.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		<io name="writer">
		<engine type="SST">
		<parameter key="MarshalMethod" value="BP"/>
		<parameter key="DataTransport" value="rdma"/>
		<!--parameter key="DataTransport" value="rdma"-->
		</engine>
		</io>

		@@ -25,7 +25,7 @@
		<io name="readerInput">
		<engine type="SST">
		<parameter key="MarshalMethod" value="BP"/>
		<parameter key="DataTransport" value="rdma"/>
		<!--parameter key="DataTransport" value="rdma"-->
		</engine>
		</io>

examples/heatTransfer/heat_sst_ffs_rdma.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		<io name="writer">
		<engine type="SST">
		<parameter key="MarshalMethod" value="FFS"/>
		<parameter key="DataTransport" value="rdma"/>
		<!--parameter key="DataTransport" value="rdma"-->
		</engine>
		</io>

		@@ -25,7 +25,7 @@
		<io name="readerInput">
		<engine type="SST">
		<parameter key="MarshalMethod" value="FFS"/>
		<parameter key="DataTransport" value="rdma"/>
		<!--parameter key="DataTransport" value="rdma"-->
		</engine>
		</io>

source/adios2/engine/sst/SstReader.cpp

+47 −2

Original line number	Diff line number	Diff line
		@@ -73,6 +73,51 @@ SstReader::SstReader(IO &io, const std::string &name, const Mode mode,
		return (void *)NULL;
		};

		auto attrFFSCallback = [](void reader, const char attrName,
		const char type, void data) {
		class SstReader::SstReader *Reader =
		reinterpret_cast<class SstReader::SstReader *>(reader);
		if (attrName == NULL)
		{
		// if attrName is NULL, prepare for attr reinstallation
		Reader->m_IO.RemoveAllAttributes();
		return;
		}
		std::string Type(type);
		try
		{
		if (Type == "compound")
		{
		return;
		}
		else if (Type == "string")
		{
		Reader->m_IO.DefineAttribute<std::string>(attrName,
		(char *)data);
		}
		#define declare_type(T) \
		else if (Type == helper::GetType<T>()) \
		{ \
		std::cout << "Loading attribute matched type " << Type << std::endl; \
		Reader->m_IO.DefineAttribute<T>(attrName, (T )data); \
		}

		ADIOS2_FOREACH_ATTRIBUTE_PRIMITIVE_TYPE_1ARG(declare_type)
		#undef declare_type
		else
		{
		std::cout << "Loading attribute matched no type " << Type
		<< std::endl;
		}
		}
		catch (...)
		{
		std::cout << "Load failed" << std::endl;
		return;
		}
		return;
		};

		auto arrayFFSCallback = [](void reader, const char variableName,
		const char type, int DimCount, size_t Shape,
		size_t Start, size_t Count) {
		@@ -109,7 +154,8 @@ SstReader::SstReader(IO &io, const std::string &name, const Mode mode,
		return (void *)NULL;
		};

		SstReaderInitFFSCallback(m_Input, this, varFFSCallback, arrayFFSCallback);
		SstReaderInitFFSCallback(m_Input, this, varFFSCallback, arrayFFSCallback,
		attrFFSCallback);

		delete[] cstr;
		}
		@@ -202,7 +248,6 @@ StepStatus SstReader::BeginStep(StepMode Mode, const float timeout_sec)
		(*m_CurrentStepMetaData->WriterMetadata)->DataSize);

		m_IO.RemoveAllVariables();
		m_IO.RemoveAllAttributes();
		m_BP3Deserializer->ParseMetadata(m_BP3Deserializer->m_Metadata, m_IO);
		m_IO.ResetVariablesStepSelection(true,
		"in call to SST Reader BeginStep");

source/adios2/engine/sst/SstWriter.cpp

+58 −1

Original line number	Diff line number	Diff line
		@@ -62,11 +62,67 @@ StepStatus SstWriter::BeginStep(StepMode mode, const float timeout_sec)
		return StepStatus::OK;
		}

		void SstWriter::FFSMarshalAttributes()
		{
		const auto attributesDataMap = m_IO.GetAttributesDataMap();

		const uint32_t attributesCount =
		static_cast<uint32_t>(attributesDataMap.size());

		// if there are no new attributes, nothing to do
		if (attributesCount == m_FFSMarshaledAttributesCount)
		return;

		for (const auto &attributePair : attributesDataMap)
		{
		const std::string name(attributePair.first);
		const std::string type(attributePair.second.first);

		if (type == "unknown")
		{
		}
		else if (type == "string")
		{
		core::Attribute<std::string> &attribute =
		*m_IO.InquireAttribute<std::string>(name);
		int element_count = -1;
		const char *data_addr = attribute.m_DataSingleValue.c_str();
		if (!attribute.m_IsSingleValue)
		{
		//
		}

		SstFFSMarshalAttribute(m_Output, name.c_str(), type.c_str(),
		sizeof(char *), element_count, data_addr);
		}
		#define declare_type(T) \
		else if (type == helper::GetType<T>()) \
		{ \
		core::Attribute<T> &attribute = *m_IO.InquireAttribute<T>(name); \
		int element_count = -1; \
		void *data_addr = &attribute.m_DataSingleValue; \
		if (!attribute.m_IsSingleValue) \
		{ \
		element_count = attribute.m_Elements; \
		data_addr = attribute.m_DataArray.data(); \
		} \
		SstFFSMarshalAttribute(m_Output, attribute.m_Name.c_str(), \
		type.c_str(), sizeof(T), element_count, \
		data_addr); \
		}

		ADIOS2_FOREACH_ATTRIBUTE_PRIMITIVE_TYPE_1ARG(declare_type)
		#undef declare_type
		}
		}

		void SstWriter::EndStep()
		{
		m_BetweenStepPairs = false;
		if (m_MarshalMethod == SstMarshalFFS)
		{
		SstWriter:
		FFSMarshalAttributes();
		SstFFSWriterEndStep(m_Output, m_WriterStep);
		}
		else if (m_MarshalMethod == SstMarshalBP)
		@@ -102,7 +158,8 @@ void SstWriter::EndStep()
		newblock->data.block = m_BP3Serializer->m_Data.m_Buffer.data();
		newblock->serializer = m_BP3Serializer;
		SstProvideTimestep(m_Output, &newblock->metadata, &newblock->data,
		m_WriterStep, lf_FreeBlocks, newblock);
		m_WriterStep, lf_FreeBlocks, newblock, NULL, NULL,
		NULL);
		}
		else
		{

source/adios2/engine/sst/SstWriter.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,12 +68,14 @@ private:
		SstStream m_Output;
		long m_WriterStep = -1;
		bool m_BetweenStepPairs = false;
		size_t m_FFSMarshaledAttributesCount = 0;
		struct _SstParams Params;
		#define declare_locals(Param, Type, Typedecl, Default) \
		Typedecl m_##Param = Default;
		SST_FOREACH_PARAMETER_TYPE_4ARGS(declare_locals)
		#undef declare_locals

		void FFSMarshalAttributes();
		void DoClose(const int transportIndex = -1) final;
		};