Text archives Help
- From: bigler@sci.utah.edu
- To: manta@sci.utah.edu
- Subject: [Manta] r1837 - in trunk: include tests
- Date: Thu, 8 Nov 2007 10:47:39 -0700 (MST)
Author: bigler
Date: Thu Nov 8 10:47:38 2007
New Revision: 1837
Added:
trunk/tests/NoSSEDoubleTest.cmake
- copied, changed from r1814, trunk/tests/NoSSETest.cmake
trunk/tests/NoSSEFloatTest.cmake
- copied, changed from r1814, trunk/tests/NoSSETest.cmake
Removed:
trunk/tests/NoSSETest.cmake
Modified:
trunk/include/CMakeLists.txt
trunk/tests/SmokeTest.taz.sh
Log:
include/CMakeLists.txt
Set the default type of Real to float for non-SSE builds. This will
match things with the SSE build a little better.
tests/NoSSEDoubleTest.cmake
tests/NoSSEFloatTest.cmake
tests/NoSSETest.cmake
tests/SmokeTest.taz.sh
Broke NoSSETest into two different tests. One for float and one for
double.
Modified: trunk/include/CMakeLists.txt
==============================================================================
--- trunk/include/CMakeLists.txt (original)
+++ trunk/include/CMakeLists.txt Thu Nov 8 10:47:38 2007
@@ -9,7 +9,7 @@
SET(MANTA_REAL float CACHE STRING "Typedef for Real" FORCE)
ELSE(MANTA_SSE)
# Set a default
- SET(MANTA_REAL double CACHE STRING "Typedef for Real")
+ SET(MANTA_REAL float CACHE STRING "Typedef for Real")
ENDIF(MANTA_SSE)
SET(MANTA_COLOR_COMPONENT float CACHE STRING "Typedef for ColorComponent")
Copied: trunk/tests/NoSSEDoubleTest.cmake (from r1814,
trunk/tests/NoSSETest.cmake)
==============================================================================
--- trunk/tests/NoSSETest.cmake (original)
+++ trunk/tests/NoSSEDoubleTest.cmake Thu Nov 8 10:47:38 2007
@@ -1,6 +1,6 @@
# Where the source code lives
SET (CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/..")
-SET (CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}/build-ctest-nosse")
+SET (CTEST_BINARY_DIRECTORY
"${CTEST_SOURCE_DIRECTORY}/build-ctest-nosse-double")
# Make sure we always reconfigure cmake stuff from scratch and don't
# rely on previously built libraries
@@ -15,7 +15,7 @@
#SET (CTEST_COMMAND "ctest -D Experimental")
SET(CTEST_INITIAL_CACHE "
- BUILDNAME:STRING=NoSSE
+ BUILDNAME:STRING=NoSSE-Double
SCENE_GALILEO:BOOL=ON
SCENE_GRIDISOVOL:BOOL=ON
SCENE_OCTISOVOL:BOOL=ON
@@ -25,6 +25,7 @@
BUILD_TESTING:BOOL=ON
MANTA_SSE:BOOL=OFF
MANTA_SSE_GCC:BOOL=OFF
+ MANTA_REAL:STRING=double
")
# SITE:STRING=cibc-rd1.sci.utah.edu
Copied: trunk/tests/NoSSEFloatTest.cmake (from r1814,
trunk/tests/NoSSETest.cmake)
==============================================================================
--- trunk/tests/NoSSETest.cmake (original)
+++ trunk/tests/NoSSEFloatTest.cmake Thu Nov 8 10:47:38 2007
@@ -1,6 +1,6 @@
# Where the source code lives
SET (CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}/..")
-SET (CTEST_BINARY_DIRECTORY "${CTEST_SOURCE_DIRECTORY}/build-ctest-nosse")
+SET (CTEST_BINARY_DIRECTORY
"${CTEST_SOURCE_DIRECTORY}/build-ctest-nosse-float")
# Make sure we always reconfigure cmake stuff from scratch and don't
# rely on previously built libraries
@@ -15,7 +15,7 @@
#SET (CTEST_COMMAND "ctest -D Experimental")
SET(CTEST_INITIAL_CACHE "
- BUILDNAME:STRING=NoSSE
+ BUILDNAME:STRING=NoSSE-Float
SCENE_GALILEO:BOOL=ON
SCENE_GRIDISOVOL:BOOL=ON
SCENE_OCTISOVOL:BOOL=ON
@@ -25,6 +25,7 @@
BUILD_TESTING:BOOL=ON
MANTA_SSE:BOOL=OFF
MANTA_SSE_GCC:BOOL=OFF
+ MANTA_REAL:STRING=float
")
# SITE:STRING=cibc-rd1.sci.utah.edu
Modified: trunk/tests/SmokeTest.taz.sh
==============================================================================
--- trunk/tests/SmokeTest.taz.sh (original)
+++ trunk/tests/SmokeTest.taz.sh Thu Nov 8 10:47:38 2007
@@ -8,6 +8,7 @@
source /Users/bigler/.bashrc
#ctest -S /Users/bigler/manta/testing/src/tests/SmokeTest.cmake -V >>
/Users/bigler/manta/testing/logs/`date +%F`.log 2>&1
ctest -S /Users/bigler/manta/testing/src/tests/SSETest.cmake -V >>
/Users/bigler/manta/testing/logs/`date +%F`.log 2>&1
-ctest -S /Users/bigler/manta/testing/src/tests/NoSSETest.cmake -V >>
/Users/bigler/manta/testing/logs/`date +%F`.log 2>&1
+ctest -S /Users/bigler/manta/testing/src/tests/NoSSEFloatTest.cmake -V >>
/Users/bigler/manta/testing/logs/`date +%F`.log 2>&1
+ctest -S /Users/bigler/manta/testing/src/tests/NoSSEDoubleTest.cmake -V >>
/Users/bigler/manta/testing/logs/`date +%F`.log 2>&1
echo "#"
echo "Finished "`date`
- [Manta] r1837 - in trunk: include tests, bigler, 11/08/2007
Archive powered by MHonArc 2.6.16.