Pull request #524: Bugfix/install nvector tests

Merge in SUNDIALS/sunrepo from bugfix/install-nvector-tests to develop Squashed commit of the following: commit 4509bcc22f840d0365c5b19ec92ff8eeeefa7ce8 Author: Balos, Cody Joe <balos1@llnl.gov> Date: Mon Feb 7 17:01:52 2022 -0800 remove sundials_nvector.c from the rest of the vector tests commit 8c9ae5790ca56a780565f886c11bac1a783812a9 Author: Balos, Cody Joe <balos1@llnl.gov> Date: Mon Feb 7 16:16:12 2022 -0800 remove dependency on sundials_nvector.c in the installed nvector example for cuda, serial, sycl
LLNL · Feb 8, 2022 · 7e1a8a3 · 7e1a8a3
1 parent 51ad3ab
commit 7e1a8a3
Show file tree

Hide file tree

Showing 15 changed files with 0 additions and 31 deletions.
diff --git a/examples/nvector/C_openmp/CMakeLists.txt b/examples/nvector/C_openmp/CMakeLists.txt
@@ -30,7 +30,6 @@ set(nvector_openmp_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   )
 
 # If building F2003 tests
@@ -93,7 +92,6 @@ foreach(example_tuple ${nvector_openmp_examples})
     install(FILES ${example}.c
       ../test_nvector.c
       ../test_nvector.h
-      ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/C_openmp)
   endif()
 

diff --git a/examples/nvector/cuda/CMakeLists.txt b/examples/nvector/cuda/CMakeLists.txt
@@ -27,7 +27,6 @@ set(nvector_cuda_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   )
 
 # Add source directory to include directories
@@ -92,7 +91,6 @@ foreach(example_tuple ${nvector_cuda_examples})
       ../test_nvector.c
       ../test_nvector.h
       ${SUNDIALS_SOURCE_DIR}/examples/utilities/custom_memory_helper_gpu.h
-      ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/cuda)
   endif()
 

diff --git a/examples/nvector/manyvector/CMakeLists.txt b/examples/nvector/manyvector/CMakeLists.txt
@@ -26,7 +26,6 @@ set(nvector_manyvector_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   )
 
 # If building F2003 tests
@@ -90,7 +89,6 @@ foreach(example_tuple ${nvector_manyvector_examples})
     install(FILES ${example}.c
       ../test_nvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/manyvector)
   endif()
 

diff --git a/examples/nvector/mpicuda/CMakeLists.txt b/examples/nvector/mpicuda/CMakeLists.txt
@@ -27,7 +27,6 @@ set(nvector_cuda_examples
 set(nvector_examples_dependencies
   test_nvector
   test_mpinvector
-  sundials_nvector
   )
 
 # Add source directory to include directories
@@ -97,7 +96,6 @@ foreach(example_tuple ${nvector_cuda_examples})
       ../test_nvector.c
       ../test_mpinvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/mpicuda)
   endif()
 

diff --git a/examples/nvector/mpimanyvector/CMakeLists.txt b/examples/nvector/mpimanyvector/CMakeLists.txt
@@ -27,7 +27,6 @@ set(nvector_mpimanyvector_examples
 set(nvector_examples_dependencies
   test_nvector
   test_mpinvector
-  sundials_nvector
   )
 
 # If building F2003 tests
@@ -129,7 +128,6 @@ foreach(example_tuple ${nvector_mpimanyvector_examples})
       ../test_nvector.c
       ../test_mpinvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/mpimanyvector)
   endif()
 

diff --git a/examples/nvector/mpiplusx/CMakeLists.txt b/examples/nvector/mpiplusx/CMakeLists.txt
@@ -26,7 +26,6 @@ set(nvector_mpiplusx_examples
 set(nvector_examples_dependencies
   test_nvector
   test_mpinvector
-  sundials_nvector
   )
 
 # If building F2003 tests
@@ -127,7 +126,6 @@ foreach(example_tuple ${nvector_mpiplusx_examples})
       ../test_nvector.c
       ../test_mpinvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/mpiplusx)
   endif()
 

diff --git a/examples/nvector/mpiraja/CMakeLists.txt b/examples/nvector/mpiraja/CMakeLists.txt
@@ -27,7 +27,6 @@ set(nvector_raja_examples
 set(nvector_examples_dependencies
   test_nvector
   test_mpinvector
-  sundials_nvector
   sundials_math
   )
 
@@ -109,7 +108,6 @@ foreach(example_tuple ${nvector_raja_examples})
       ../test_nvector.c
       ../test_mpinvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       ../../../src/sundials/sundials_math.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/mpiraja)
   endif()

diff --git a/examples/nvector/openmpdev/CMakeLists.txt b/examples/nvector/openmpdev/CMakeLists.txt
@@ -26,7 +26,6 @@ set(nvector_openmpdev_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   )
 
 # Add source directory to include directories
@@ -82,7 +81,6 @@ foreach(example_tuple ${nvector_openmpdev_examples})
     install(FILES ${example}.c
       ../test_nvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/openmpdev)
   endif()
 

diff --git a/examples/nvector/parhyp/CMakeLists.txt b/examples/nvector/parhyp/CMakeLists.txt
@@ -27,7 +27,6 @@ set(nvector_parhyp_examples
 set(nvector_examples_dependencies
   test_nvector
   test_mpinvector
-  sundials_nvector
   )
 
 # Add source directory to include directories
@@ -109,8 +108,6 @@ foreach(example_tuple ${nvector_parhyp_examples})
     install(FILES ${example}.c
       ../test_nvector.c
       ../test_mpinvector.c
-      ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/parhyp)
   endif()
 

diff --git a/examples/nvector/petsc/CMakeLists.txt b/examples/nvector/petsc/CMakeLists.txt
@@ -27,7 +27,6 @@ set(nvector_petsc_examples
 set(nvector_examples_dependencies
   test_nvector
   test_mpinvector
-  sundials_nvector
   )
 
 # Add source directory to include directories
@@ -107,7 +106,6 @@ foreach(example_tuple ${nvector_petsc_examples})
       ../test_nvector.c
       ../test_mpinvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/petsc)
   endif()
 

diff --git a/examples/nvector/pthreads/CMakeLists.txt b/examples/nvector/pthreads/CMakeLists.txt
@@ -30,7 +30,6 @@ set(nvector_pthreads_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   )
 
 # If building F2003 tests
@@ -93,7 +92,6 @@ foreach(example_tuple ${nvector_pthreads_examples})
     install(FILES ${example}.c
       ../test_nvector.c
       ../test_nvector.h
-      ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/pthreads)
   endif()
 

diff --git a/examples/nvector/raja/CMakeLists.txt b/examples/nvector/raja/CMakeLists.txt
@@ -25,7 +25,6 @@ set(nvector_raja_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   sundials_math
 )
 
@@ -107,7 +106,6 @@ foreach(example_tuple ${nvector_raja_examples})
       ../test_nvector.c
       ../test_nvector.h
       ${SUNDIALS_SOURCE_DIR}/examples/utilities/${_custom_memhelper}
-      ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_nvector.c
       ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_math.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/raja)
   endif()

diff --git a/examples/nvector/serial/CMakeLists.txt b/examples/nvector/serial/CMakeLists.txt
@@ -26,7 +26,6 @@ set(nvector_serial_examples
 # Dependencies for nvector examples
 set(nvector_examples_dependencies
   test_nvector
-  sundials_nvector
   )
 
 # If building F2003 tests
@@ -90,7 +89,6 @@ foreach(example_tuple ${nvector_serial_examples})
     install(FILES ${example}.c
       ../test_nvector.c
       ../test_nvector.h
-      ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/serial)
   endif()
 

diff --git a/examples/nvector/sycl/CMakeLists.txt b/examples/nvector/sycl/CMakeLists.txt
@@ -91,7 +91,6 @@ foreach(example_tuple ${nvector_sycl_examples})
       ../test_nvector.c
       ../test_nvector.h
       ${SUNDIALS_SOURCE_DIR}/examples/utilities/custom_memory_helper_sycl.h
-      ${SUNDIALS_SOURCE_DIR}/src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/sycl)
   endif()
 

diff --git a/examples/nvector/trilinos/CMakeLists.txt b/examples/nvector/trilinos/CMakeLists.txt
@@ -34,12 +34,10 @@ if(Trilinos_MPI)
   set(nvector_examples_dependencies
     test_nvector
     test_mpinvector
-    sundials_nvector
     )
 else()
   set(nvector_examples_dependencies
     test_nvector
-    sundials_nvector
     )
 endif()
 
@@ -118,7 +116,6 @@ foreach(example_tuple ${nvector_trilinos_examples})
       ../test_nvector.c
       ../test_mpinvector.c
       ../test_nvector.h
-      ../../../src/sundials/sundials_nvector.c
       DESTINATION ${EXAMPLES_INSTALL_PATH}/nvector/trilinos)
   endif()