Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/sidre data collection #64

Merged
merged 52 commits into from
Sep 8, 2021
Merged

Feature/sidre data collection #64

Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
c0ac876
sidre integration start. Basic view creation written, not used in cod…
Aug 29, 2020
de4aea2
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
Aug 31, 2020
bdac89c
import works, sidre test doesnt: function used not found
Sep 15, 2020
bb3529d
working towards storing int Fields sidre test
Sep 17, 2020
ecd155d
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
Sep 17, 2020
a4a8f54
Moving the templated methods of SidreDataCollection to inlined
jmikeowen Sep 17, 2020
ccc4f3f
Merge branch 'feature/sidre-data-collection' of https://github.com/jm…
MishaZakharchanka Sep 17, 2020
3a5b877
working out axom functions overloaded with const
MishaZakharchanka Oct 1, 2020
d627d2a
commented out const overloaded func, working on wrapping Group::print().
MishaZakharchanka Oct 2, 2020
59a3d47
Int test almost working, everything but Data is reading correctly
MishaZakharchanka Oct 26, 2020
e889053
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
MishaZakharchanka Oct 26, 2020
a8061ab
Working Sidre test for ints
MishaZakharchanka Oct 28, 2020
e502d05
Trying to build to include gtest, issues with linking.
MishaZakharchanka Nov 20, 2020
11605f0
Merge branch 'feature/sidre-data-collection' into python-env-sidre
mdavis36 Nov 20, 2020
fbea6d2
Merge branch 'feature/sidre-data-collection' into python-env-sidre
mdavis36 Nov 20, 2020
63546f8
Merge branch 'feature/python-env' into python-env-sidre
mdavis36 Nov 23, 2020
2d05a5c
Merge branch 'feature/python-env' into feature/sidre-data-collection
MishaZakharchanka Nov 23, 2020
671810c
Merge branch 'feature/sidre-data-collection' into python-env-sidre
mdavis36 Nov 23, 2020
4dca95f
Merge branch 'feature/python-env' into python-env-sidre
mdavis36 Nov 23, 2020
5de3d54
Fixing CXXTests CMake merge conflict.
mdavis36 Nov 23, 2020
aa6ac84
Merge pull request #37 from LLNL/python-env-sidre
MishaZakharchanka Nov 24, 2020
99f61ed
Scalar value tests working except char and bool
MishaZakharchanka Dec 15, 2020
3a5a168
Vector storage in Sidre working
MishaZakharchanka Jan 15, 2021
47e702f
Field of vectors stored in Sidre works
MishaZakharchanka Jan 15, 2021
5afe3f0
vector working merged with develop
MishaZakharchanka Jan 20, 2021
4c590af
Missed line comment.
mdavis36 Jan 20, 2021
9dd654c
Expose SPHERAL_CXX_LIBS porperty to CXXTests.
mdavis36 Jan 20, 2021
a78ef4c
tuples saved into sidre
MishaZakharchanka Feb 23, 2021
437b44f
resolved merge conflict.
MishaZakharchanka Feb 26, 2021
f689130
removing deleted header file
MishaZakharchanka Feb 26, 2021
a7b843c
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
MishaZakharchanka Feb 26, 2021
749212a
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
MishaZakharchanka Apr 19, 2021
2015b1d
Added storing and tests for dim types
MishaZakharchanka Apr 19, 2021
bd65c07
Added template for Dim types, Dim1Vector test supposed to fail
MishaZakharchanka May 17, 2021
f4d4df9
cleaned up and tests working, not all tests testing all values
MishaZakharchanka May 18, 2021
5712623
Problem with NRankTensor not working like other dim types
MishaZakharchanka Jun 2, 2021
85c3ec4
Dim<1>ThirdRankTensor storing in sidre working
MishaZakharchanka Jun 4, 2021
5aa42c2
merging develope fixed conflict
MishaZakharchanka Jun 4, 2021
41843c0
Dim2 vector not saving correctly, buffer showing 3th dim
MishaZakharchanka Jun 24, 2021
a4c437d
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
MishaZakharchanka Jun 24, 2021
6f13c4a
Dim<2> Vector working with extra function
MishaZakharchanka Jun 29, 2021
f2e5ee9
Templating out Dimensional value for is_rank_n_tensor type trait.
mdavis36 Jul 2, 2021
6896451
Drawing out re-org prototype for tests.
mdavis36 Jul 2, 2021
8fa1953
Adding AxomType to DataTypeTraits, may not need this later...
mdavis36 Jul 6, 2021
7b8d4d0
Prototype sidre alloc with vector / scalar types.
mdavis36 Jul 6, 2021
9b0d637
Merge pull request #76 from LLNL/feature/mdavis36/sidre-data-collection
MishaZakharchanka Jul 8, 2021
a741238
tests changed to be macros and fields now saved into Groups
MishaZakharchanka Jul 30, 2021
888037f
Merge remote-tracking branch 'origin/develop' into feature/sidre-data…
MishaZakharchanka Jul 30, 2021
5a77ab5
formatting changes
MishaZakharchanka Aug 9, 2021
86e8197
Merge branch 'develop' into feature/sidre-data-collection
MishaZakharchanka Aug 9, 2021
0cd2951
fixing CXXTests CMake format
MishaZakharchanka Aug 13, 2021
94d807a
Merge branch 'develop' into feature/sidre-data-collection
MishaZakharchanka Aug 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cmake/tpl/axom.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ set(AXOM_DIST "Axom-v0.3.3.tar.gz")
set(AXOM_URL "https://github.com/LLNL/axom/releases/download/v0.3.3/${AXOM_DIST}")
set(AXOM_CACHE "${CACHE_DIR}/${AXOM_DIST}")

set(${lib_name}_libs )
set(${lib_name}_libs
libaxom.a
)

if(${lib_name}_BUILD)

Expand Down
8 changes: 7 additions & 1 deletion cmake/tpl/conduit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ set(CONDUIT_DIST "conduit-v0.5.1-src-with-blt.tar.gz")
set(CONDUIT_URL "https://github.com/LLNL/conduit/releases/download/v0.5.1/${CONDUIT_DIST}")
set(CONDUIT_CACHE "${CACHE_DIR}/${CONDUIT_DIST}")

set(${lib_name}_libs )
list(APPEND ${lib_name}_INCLUDES $<BUILD_INTERFACE:${${lib_name}_DIR}/include/${lib_name}>)

set(${lib_name}_libs
libconduit.so
libconduit_blueprint.so
libconduit_relay.so
)

if(${lib_name}_BUILD)

Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,6 @@ foreach(e_package ${extra_packages})
add_subdirectory(${extra_packages_DIR}/${e_package} ${CMAKE_CURRENT_BINARY_DIR}/${e_package})
endforeach()

#add_subdirectory(CXXTests)
add_subdirectory(CXXTests)

install(EXPORT ${PROJECT_NAME}-targets DESTINATION Spheral/lib/cmake)
21 changes: 10 additions & 11 deletions src/CXXTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,25 @@
#------------------------------------------------------------------------------

set(gtest_spheral_tests
basic.cc
testSidreStorage.cc
)


# set(spheral_test_depends
# spheral_blt_depends
# )

#------------------------------------------------------------------------------
# Add gtest C++ tests
#------------------------------------------------------------------------------

get_property(SPHERAL_CXX_LIBS GLOBAL PROPERTY SPHERAL_CXX_LIBS)

foreach(test ${gtest_spheral_tests})
get_filename_component( test_name ${test} NAME_WE )
blt_add_executable( NAME ${test_name}_test
blt_add_executable( NAME ${test_name}_test
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Formatting

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bump

SOURCES ${test}
OUTPUT_DIR ${${PROJECT_BINARY_DIR}/tests}
DEPENDS_ON ${SPHERAL_CXX_LIBS} ${spheral_blt_depends} gtest
OUTPUT_DIR ${PROJECT_BINARY_DIR}/tests
DEPENDS_ON gtest ${SPHERAL_CXX_LIBS} ${spheral_blt_depends}
)

blt_add_test( NAME ${test_name}
COMMAND ${test_name}_test
)
blt_add_test( NAME ${test_name}
COMMAND ${test_name}_test
)
endforeach()
16 changes: 16 additions & 0 deletions src/CXXTests/testSidreStorage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#include "testSidreStorage.hh"

TYPED_TEST(SidreDataCollectionTestNew, SidreAllocViewTest)
{
Spheral::SidreDataCollection myData;
size_t n = 10;

SpheralTestNodeList<TypeParam> makeNodeList("test bed", n, 0);
SpheralTestField<TypeParam> testField("test field", makeNodeList);

initField<TypeParam>(testField, n);

axom::sidre::Group *myTemp = myData.sidreStoreField("SidreTest", testField);

testSidreData<TypeParam>(testField, myTemp);
}
Loading