Text archives Help

---

Author: bigler
Date: Fri Apr 11 17:35:52 2008
New Revision: 2177

Modified:
   trunk/StandAlone/CMakeLists.txt
Log:
StandAlone/CMakeLists.txt

  Make the bunny_zipper.ply file configurable.

  Be able to change the number of threads for the BUNNY and cornell box test.

  Added additional versions of tests with different number of processors.


Modified: trunk/StandAlone/CMakeLists.txt
==============================================================================
--- trunk/StandAlone/CMakeLists.txt     (original)
+++ trunk/StandAlone/CMakeLists.txt     Fri Apr 11 17:35:52 2008
@@ -7,28 +7,43 @@
   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)
 
-  SET (bunny_sci_model 
/usr/sci/data/Geometry/Stanford_Sculptures/bun_zipper.ply)
-  IF( EXISTS "${bunny_sci_model}" )
+  # Search for the file
+  FIND_FILE(SCI_MODEL_BUNNY bun_zipper.ply
+    PATHS /usr/sci/data/Geometry/Stanford_Sculptures
+    NO_DEFAULT_PATH)
+  IF( SCI_MODEL_BUNNY )
        SET(IMAGE_TRAVERSER_ARG -imagetraverser "tiled(-square)")
        SET(CAMERA_ARG -camera "pinhole( -eye -0.0308032 0.257053 -0.0461074 
-lookat -0.0396542 0.111762 -0.0132095 -up -0.072059 0.224437 0.971821 -hfov 
60 -vfov 60 -normalizeRays -createCornerRays )")
-       MACRO(ADD_BUNNY_TEST acceleration_structure)
-         ADD_TEST(Bunny_${acceleration_structure}_NP2 
${CMAKE_BINARY_DIR}/bin/manta -np 2 -scene 
"${CMAKE_BINARY_DIR}/lib/libscene_triangleSceneViewer${CMAKE_SHARED_LIBRARY_SUFFIX}(-${acceleration_structure}
 -model ${bunny_sci_model} -triangleType Wald_tri)" ${IMAGE_TRAVERSER_ARG} 
${CAMERA_ARG} -nodisplaybench-dart 200 20)
+       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})
        ENDMACRO(ADD_BUNNY_TEST)
 
-       ADD_BUNNY_TEST("DynBVH")
-       ADD_BUNNY_TEST("KDTree")
+       ADD_BUNNY_TEST("DynBVH" 1)
+       ADD_BUNNY_TEST("DynBVH" 2)
+       ADD_BUNNY_TEST("KDTree" 1)
+       ADD_BUNNY_TEST("KDTree" 2)
        IF(MANTA_SSE)
-               ADD_BUNNY_TEST("CGT")
+               ADD_BUNNY_TEST("CGT" 1)
+               ADD_BUNNY_TEST("CGT" 2)
        ENDIF(MANTA_SSE)
-  ENDIF( EXISTS "${bunny_sci_model}" )
-  
+  ENDIF( SCI_MODEL_BUNNY )
+
   SET(IMAGE_TRAVERSER_ARG  -imagetraverser "deadline (-dart_benchmark)")
   # We set nodisplaybench-dart to do a lot of frames so that the
   # deadline image traverser can finish before the benchmark finishes.
-  ADD_TEST(CornellBoxPathTraced_NP4 ${CMAKE_BINARY_DIR}/bin/manta -np 4 -res 
128x128 -scene "${CMAKE_SOURCE_DIR}/scenes/cornell_box.rtml" -renderer 
pathtracer ${IMAGE_TRAVERSER_ARG} -nodisplaybench-dart 10000 10)
+  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)
+  ENDMACRO(ADD_CORNELL_BOX_PATH_TRACED)
+  ADD_CORNELL_BOX_PATH_TRACED(1)
+  ADD_CORNELL_BOX_PATH_TRACED(2)
+  ADD_CORNELL_BOX_PATH_TRACED(4)
 
 ENDIF(BUILD_TESTING)
-         
+
 SET (BUILD_OCTVOL_BUILD 0 CACHE BOOL "Include .v3c1 tools")
 IF (BUILD_OCTVOL_BUILD) 
   ADD_EXECUTABLE(octvol_build octvol_build.cc)

---

• [Manta] r2177 - trunk/StandAlone, James Bigler, 04/11/2008

---

Archive powered by MHonArc 2.6.16.