From 9d054b09f1238d8f940087f7e47552ebfc548907 Mon Sep 17 00:00:00 2001 From: cindytsai Date: Mon, 15 Apr 2024 21:07:58 -0500 Subject: [PATCH] Move libyt/example to libyt/example/amr-example, and create example/quick-start --- .github/workflows/example-test-run.yml | 10 +++++----- example/CMakeLists.txt | 13 ++----------- example/amr-example/CMakeLists.txt | 11 +++++++++++ example/{ => amr-example}/Makefile | 0 example/{ => amr-example}/example.cpp | 0 example/{ => amr-example}/inline_script.py | 0 example/{ => amr-example}/make_movie.sh | 0 example/quick-start/CMakeLists.txt | 0 8 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 example/amr-example/CMakeLists.txt rename example/{ => amr-example}/Makefile (100%) rename example/{ => amr-example}/example.cpp (100%) rename example/{ => amr-example}/inline_script.py (100%) rename example/{ => amr-example}/make_movie.sh (100%) create mode 100644 example/quick-start/CMakeLists.txt diff --git a/.github/workflows/example-test-run.yml b/.github/workflows/example-test-run.yml index a1a9a9f9..8ce67ad7 100644 --- a/.github/workflows/example-test-run.yml +++ b/.github/workflows/example-test-run.yml @@ -82,26 +82,26 @@ jobs: - name: Prepare Test run: | - cd ${{ github.workspace }}/example + cd ${{ github.workspace }}/example/amr-example cp ${{ github.workspace }}/.github/tests/test-DataIO/DataIOTest.py . - name: Generate Density Data for Testing run: | - cd ${{ github.workspace }}/example + cd ${{ github.workspace }}/example/amr-example cp ${{ github.workspace }}/.github/tools/generate_density_data.cpp . g++ -o generate_density_data generate_density_data.cpp ./generate_density_data - name: Test Run and DataIO Test - example - Serial run: | - cd ${{ github.workspace }}/example + cd ${{ github.workspace }}/example/amr-example make clean make OPTIONS=-DSERIAL_MODE LIBYT_PATH="${{ env.LIBYT_SERIAL_INSTALL_PATH }}" ./example DataIOTest.py - - name: Test Run and DataIO Test - example - Parallel (MPI 3) + - name: Test Run and DataIO Test - example - Parallel (MPI Size 3) run: | - cd ${{ github.workspace }}/example + cd ${{ github.workspace }}/example/amr-example make clean make LIBYT_PATH="${{ env.LIBYT_PARALLEL_INSTALL_PATH }}" OMPI_MCA_osc=sm,pt2pt mpirun -np 3 ./example DataIOTest.py diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 1ad416b3..b59aa98e 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,11 +1,2 @@ -if (NOT SERIAL_MODE) - find_package(MPI REQUIRED) -endif () - -add_executable(example example.cpp) - -if (NOT SERIAL_MODE) - target_link_libraries(example PUBLIC MPI::MPI_CXX) -endif () -target_link_libraries(example PUBLIC yt) -target_include_directories(example PUBLIC "../include") +add_subdirectory(quick-start) +add_subdirectory(amr-example) \ No newline at end of file diff --git a/example/amr-example/CMakeLists.txt b/example/amr-example/CMakeLists.txt new file mode 100644 index 00000000..d8b8b69e --- /dev/null +++ b/example/amr-example/CMakeLists.txt @@ -0,0 +1,11 @@ +if (NOT SERIAL_MODE) + find_package(MPI REQUIRED) +endif () + +add_executable(example example.cpp) + +if (NOT SERIAL_MODE) + target_link_libraries(example PUBLIC MPI::MPI_CXX) +endif () +target_link_libraries(example PUBLIC yt) +target_include_directories(example PUBLIC "../../include") diff --git a/example/Makefile b/example/amr-example/Makefile similarity index 100% rename from example/Makefile rename to example/amr-example/Makefile diff --git a/example/example.cpp b/example/amr-example/example.cpp similarity index 100% rename from example/example.cpp rename to example/amr-example/example.cpp diff --git a/example/inline_script.py b/example/amr-example/inline_script.py similarity index 100% rename from example/inline_script.py rename to example/amr-example/inline_script.py diff --git a/example/make_movie.sh b/example/amr-example/make_movie.sh similarity index 100% rename from example/make_movie.sh rename to example/amr-example/make_movie.sh diff --git a/example/quick-start/CMakeLists.txt b/example/quick-start/CMakeLists.txt new file mode 100644 index 00000000..e69de29b