Text archives Help

---

Author: bigler
Date: Mon Apr 14 15:04:21 2008
New Revision: 2192

Modified:
   trunk/CMake/Macros.cmake
   trunk/CMakeLists.txt
   trunk/StandAlone/CMakeLists.txt
   trunk/tests/CMakeLists.txt
Log:
CMake/Macros.cmake

  Added ADD_NP_TEST macro that only adds a test if you have enough processors
  specified by TEST_NUM_PROCS.

CMakeLists.txt

  Added TEST_NUM_PROCS that identifies how many processors you wish to use for
  tests.

StandAlone/CMakeLists.txt
tests/CMakeLists.txt

  Made all the tests use ADD_NP_TEST.


Modified: trunk/CMake/Macros.cmake
==============================================================================
--- trunk/CMake/Macros.cmake    (original)
+++ trunk/CMake/Macros.cmake    Mon Apr 14 15:04:21 2008
@@ -147,3 +147,11 @@
   # Copy out the return result
   SET(${result_out} ${result})
 ENDMACRO(COMPARE_VERSION_STRINGS)
+
+# Only adds a test if TEST_NUM_PROCS is >= NP.  !(x < NP) == (x >= NP)
+# equavelance is used because CMake doesn't have >= test.
+MACRO(ADD_NP_TEST NP)
+  IF(NOT TEST_NUM_PROCS LESS ${NP})
+    ADD_TEST(${ARGN})
+  ENDIF(NOT TEST_NUM_PROCS LESS ${NP})
+ENDMACRO(ADD_NP_TEST)

Modified: trunk/CMakeLists.txt
==============================================================================
--- trunk/CMakeLists.txt        (original)
+++ trunk/CMakeLists.txt        Mon Apr 14 15:04:21 2008
@@ -17,6 +17,9 @@
   ENABLE_TESTING()
   SET(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard")
   MARK_AS_ADVANCED(BUILDNAME)
+  # Default this to 2 since most machines are now at least dual core.  You 
can
+  # bump it up as needed.
+  SET(TEST_NUM_PROCS 2 CACHE INTEGER "Maximum number of threads to use when 
running tests")
 ENDIF(BUILD_TESTING)
 
 SET(DEFAULT_BUILD_SHARED_LIBS ON)

Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt     (original)
+++ trunk/StandAlone/CMakeLists.txt     Mon Apr 14 15:04:21 2008
@@ -3,9 +3,9 @@
 TARGET_LINK_LIBRARIES(manta ${MANTA_TARGET_LINK_LIBRARIES})
 
 IF(BUILD_TESTING)
-  ADD_TEST(DefaultSceneNoDisplayBench_NP1 ${CMAKE_BINARY_DIR}/bin/manta -np 
1 -nodisplaybench-dart 200 20)
-  ADD_TEST(DefaultSceneNoDisplayBench_NP2 ${CMAKE_BINARY_DIR}/bin/manta -np 
2 -nodisplaybench-dart 400 40)
-  ADD_TEST(DefaultSceneNoDisplayBench_NP4 ${CMAKE_BINARY_DIR}/bin/manta -np 
4 -nodisplaybench-dart 800 80)
+  ADD_NP_TEST(1 DefaultSceneNoDisplayBench_NP1 ${CMAKE_BINARY_DIR}/bin/manta 
-np 1 -nodisplaybench-dart 200 20)
+  ADD_NP_TEST(2 DefaultSceneNoDisplayBench_NP2 ${CMAKE_BINARY_DIR}/bin/manta 
-np 2 -nodisplaybench-dart 400 40)
+  ADD_NP_TEST(4 DefaultSceneNoDisplayBench_NP4 ${CMAKE_BINARY_DIR}/bin/manta 
-np 4 -nodisplaybench-dart 800 80)
 
   # Search for the file
   FIND_FILE(SCI_MODEL_BUNNY bun_zipper.ply
@@ -17,7 +17,7 @@
        MACRO(ADD_BUNNY_TEST acceleration_structure NP)
     MATH(EXPR N_BENCH_FRAMES  "${NP} * 100")
     MATH(EXPR N_WARMUP_FRAMES "${NP} * 10")
-         ADD_TEST(Bunny_${acceleration_structure}_NP${NP} 
${CMAKE_BINARY_DIR}/bin/manta -np ${NP} -scene 
"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}(-${acceleration_structure}
 -model ${SCI_MODEL_BUNNY} -triangleType Wald_tri)" ${IMAGE_TRAVERSER_ARG} 
${CAMERA_ARG} -nodisplaybench-dart ${N_BENCH_FRAMES} ${N_WARMUP_FRAMES})
+         ADD_NP_TEST(${NP} Bunny_${acceleration_structure}_NP${NP} 
${CMAKE_BINARY_DIR}/bin/manta -np ${NP} -scene 
"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}(-${acceleration_structure}
 -model ${SCI_MODEL_BUNNY} -triangleType Wald_tri)" ${IMAGE_TRAVERSER_ARG} 
${CAMERA_ARG} -nodisplaybench-dart ${N_BENCH_FRAMES} ${N_WARMUP_FRAMES})
        ENDMACRO(ADD_BUNNY_TEST)
 
        ADD_BUNNY_TEST("DynBVH" 1)
@@ -36,7 +36,7 @@
   MACRO(ADD_CORNELL_BOX_PATH_TRACED NP)
     # We could changed the resolution to try and make each benchmark take the
     # same amount of time per test.
-    ADD_TEST(CornellBoxPathTraced_NP${NP} ${CMAKE_BINARY_DIR}/bin/manta -np 
${NP} -res 128x128 -scene "${CMAKE_SOURCE_DIR}/scenes/cornell_box.rtml" 
-renderer pathtracer ${IMAGE_TRAVERSER_ARG} -nodisplaybench-dart 10000 10)
+    ADD_NP_TEST(${NP} CornellBoxPathTraced_NP${NP} 
${CMAKE_BINARY_DIR}/bin/manta -np ${NP} -res 128x128 -scene 
"${CMAKE_SOURCE_DIR}/scenes/cornell_box.rtml" -renderer pathtracer 
${IMAGE_TRAVERSER_ARG} -nodisplaybench-dart 10000 10)
   ENDMACRO(ADD_CORNELL_BOX_PATH_TRACED)
   ADD_CORNELL_BOX_PATH_TRACED(1)
   ADD_CORNELL_BOX_PATH_TRACED(2)

Modified: trunk/tests/CMakeLists.txt
==============================================================================
--- trunk/tests/CMakeLists.txt  (original)
+++ trunk/tests/CMakeLists.txt  Mon Apr 14 15:04:21 2008
@@ -7,8 +7,8 @@
 IF(BUILD_TESTING)
   SET(AtomicIterations 100)
 
-  ADD_TEST(AtomicCounter_NP1 ${CMAKE_BINARY_DIR}/bin/atomic_counter 1 
${AtomicIterations})
-  ADD_TEST(AtomicCounter_NP2 ${CMAKE_BINARY_DIR}/bin/atomic_counter 2 
${AtomicIterations})
-  ADD_TEST(AtomicCounter_NP4 ${CMAKE_BINARY_DIR}/bin/atomic_counter 4 
${AtomicIterations})
-  ADD_TEST(AtomicCounter_NP8 ${CMAKE_BINARY_DIR}/bin/atomic_counter 8 
${AtomicIterations})
-ENDIF(BUILD_TESTING)
\ No newline at end of file
+  ADD_NP_TEST(1 AtomicCounter_NP1 ${CMAKE_BINARY_DIR}/bin/atomic_counter 1 
${AtomicIterations})
+  ADD_NP_TEST(2 AtomicCounter_NP2 ${CMAKE_BINARY_DIR}/bin/atomic_counter 2 
${AtomicIterations})
+  ADD_NP_TEST(4 AtomicCounter_NP4 ${CMAKE_BINARY_DIR}/bin/atomic_counter 4 
${AtomicIterations})
+  ADD_NP_TEST(8 AtomicCounter_NP8 ${CMAKE_BINARY_DIR}/bin/atomic_counter 8 
${AtomicIterations})
+ENDIF(BUILD_TESTING)

---

• [Manta] r2192 - in trunk: . CMake StandAlone tests, James Bigler, 04/14/2008

---

Archive powered by MHonArc 2.6.16.