Refactor Loki/TinyXML cmake to search for system libraries before building ThirdParty.

Remove CHUD option since this is no longer provided in OS X.
Add a few comments to CMakeLists.

CMakeLists.txt

@@ -17,12 +17,15 @@ LIST(GET NEKVERLIST 1 NEKTAR_VERSION_MINOR)
 LIST(GET NEKVERLIST 2 NEKTAR_VERSION_PATCH)
 SET(NEKTAR_VERSION ${NEKTAR_VERSION_MAJOR}.${NEKTAR_VERSION_MINOR}.${NEKTAR_VERSION_PATCH})
 
+# Add support for CMAKE_DEPENDENT_OPTION
 INCLUDE(CMakeDependentOption)
+
+# Enable CTest.
 ENABLE_TESTING()
 
 # Use the CMake 2.4 policy for CMake 2.6
 IF(COMMAND cmake_policy)
-  cmake_policy(SET CMP0003 OLD)
+    cmake_policy(SET CMP0003 OLD)
 ENDIF(COMMAND cmake_policy)
 
 # Find the modules included with Nektar
@@ -33,10 +36,11 @@ IF (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/dist CACHE PATH "" FORCE)
 ENDIF()
 
-# Attempt to retrieve git branch and SHA1 hash
+# Attempt to retrieve git branch and SHA1 hash of current changeset.
 INCLUDE(GetGitRevisionDescription)
 get_git_head_revision(GIT_REFSPEC GIT_SHA1)
 
+# Set library, binary, include, share and doc paths.
 SET(LIB_DIR "lib/nektar++")
 IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT APPLE )
     SET(LIB_DIR "lib64/nektar++")
@@ -48,6 +52,8 @@ SET(NEKTAR_LIB_DIR ${LIB_DIR})
 SET(NEKTAR_INCLUDE_DIR include/nektar++)
 SET(NEKTAR_SHARE_DIR share/nektar++)
 SET(NEKTAR_DOC_DIR share/doc/nektar++)
+
+# Build shared libraries.
 SET(NEKTAR_LIBRARY_TYPE "SHARED")
 
 # Set up RPATH
@@ -83,7 +89,7 @@ OPTION(NEKTAR_BUILD_TIMINGS    "Build benchmark timing codes."  OFF)
 OPTION(NEKTAR_BUILD_PACKAGES   "Build Nektar++ binary packages" OFF)
 MARK_AS_ADVANCED(NEKTAR_BUILD_PACKAGES)
 
-OPTION(NEKTAR_TEST_ALL  "Include full set of regression tests to this build."  OFF)
+OPTION(NEKTAR_TEST_ALL "Include full set of regression tests to this build." OFF)
 
 # Build options
 OPTION(NEKTAR_FULL_DEBUG "Enable Full Debugging." OFF)
@@ -94,9 +100,8 @@ IF (${CMAKE_COMPILER_IS_GNUCXX})
     MARK_AS_ADVANCED(NEKTAR_ENABLE_PROFILE)
 ENDIF (${CMAKE_COMPILER_IS_GNUCXX}) 
 
-SET(ExpressionTemplateDefault OFF)
 OPTION(NEKTAR_USE_EXPRESSION_TEMPLATES 
-    "Use Expression templates." ${ExpressionTemplateDefault})
+    "Use Expression templates." OFF)
 MARK_AS_ADVANCED(NEKTAR_USE_EXPRESSION_TEMPLATES)
 
 # BLAS Support
@@ -119,10 +124,6 @@ CMAKE_DEPENDENT_OPTION(NEKTAR_USE_SYSTEM_BLAS_LAPACK
 CMAKE_DEPENDENT_OPTION(NEKTAR_USE_ACCELERATE_FRAMEWORK
     "Use the Mac Accelerate Framework for BLAS and Lapack support." ON
     "NEKTAR_USE_BLAS_LAPACK; APPLE" OFF)
-CMAKE_DEPENDENT_OPTION(NEKTAR_USE_CHUD_FRAMEWORK
-    "Use the Mac CHUD Framework (for Shark support)." OFF
-    "APPLE" OFF)
-MARK_AS_ADVANCED(NEKTAR_USE_CHUD_FRAMEWORK)
 CMAKE_DEPENDENT_OPTION(NEKTAR_USE_DIRECT_BLAS_CALLS
     "Use direct BLAS calls rather than NekMatrix calls in the StdRegions and
     LocalRegions sublibrary" ON
@@ -154,13 +155,14 @@ SET(TPURL   http://www.nektar.info/thirdparty)
 SET(TPSRC   ${CMAKE_SOURCE_DIR}/ThirdParty)
 SET(TPBUILD ${CMAKE_BINARY_DIR}/ThirdParty)
 SET(TPDIST  ${CMAKE_BINARY_DIR}/ThirdParty/dist)
+SET(TPINC   ${CMAKE_INSTALL_PREFIX}/include/ThirdParty)
 
 # Create ThirdParty source directory if it doesn't exist already.
 IF (NOT EXISTS ${TPSRC})
     FILE(MAKE_DIRECTORY ${TPSRC})
 ENDIF ()
 
-# Find Libraries
+# Find ThirdParty libraries and headers.
 INCLUDE (ThirdPartyTinyxml)
 INCLUDE (ThirdPartyLoki)
 INCLUDE (ThirdPartyMetis)
@@ -199,11 +201,6 @@ IF( NEKTAR_USE_ACCELERATE_FRAMEWORK )
     INCLUDE (FindAccelerateFramework)
 ENDIF( NEKTAR_USE_ACCELERATE_FRAMEWORK )
 
-IF( NEKTAR_USE_CHUD_FRAMEWORK )
-    INCLUDE (FindCHUDFramework)
-    ADD_DEFINITIONS(-DNEKTAR_USING_CHUD)	
-ENDIF( NEKTAR_USE_CHUD_FRAMEWORK )
-
 IF( NEKTAR_USE_ACML )
     INCLUDE (FindACML)
     SET(NEKTAR_USING_BLAS TRUE)

cmake/FindLoki.cmake

-#
-# FindLoki.cmake: Find Loki headers
-#
-
-# Try to find system Loki headers
-FIND_PATH(LOKI_INCLUDE_DIR loki/Typelist.h)
-
-IF (LOKI_INCLUDE_DIR)
-    SET(LOKI_FOUND TRUE)
-    SET(LOKI_SYSTEM TRUE)
-ENDIF ()
-
-IF (NOT LOKI_FOUND)
-    FIND_PATH(LOKI_INCLUDE_DIR loki/Typelist.h
-        PATHS ${TPSRC}/loki-0.1.3/include NO_DEFAULT_PATH)
-
-    IF (LOKI_INCLUDE_DIR)
-        SET(LOKI_FOUND TRUE)
-
-        # Copy from source to TPDIST
-        MESSAGE(STATUS ${LOKI_INCLUDE_DIR})
-        FILE(COPY ${LOKI_INCLUDE_DIR}/loki/ DESTINATION ${TPDIST}/include/loki/)
-        SET(LOKI_INCLUDE_DIR ${TPDIST}/include CACHE PATH "" FORCE)
-    ENDIF()
-ENDIF()
-
-IF (LOKI_FOUND)
-    MESSAGE(STATUS "Found Loki: ${LOKI_INCLUDE_DIR}")
-ELSE()
-    MESSAGE(FATAL_ERROR "Could not find Loki")
-ENDIF()
-
-MARK_AS_ADVANCED(LOKI_INCLUDE_DIR)

cmake/FindTinyXml.cmake

-
-# Use TINYXML_ADDITIONAL_INCLUDE_DIRS to customize search.
-
-GET_FILENAME_COMPONENT(FIRST_THIRD_PARTY_INCLUDE ${CMAKE_SOURCE_DIR}/ThirdParty ABSOLUTE)
-GET_FILENAME_COMPONENT(SECOND_THIRD_PARTY_INCLUDE ${CMAKE_SOURCE_DIR}/../ThirdParty ABSOLUTE)
-
-FIND_PATH(TINYXML_BASE tinyxml/tinyxml.h 
-			${TINYXML_ADDITIONAL_INCLUDE_DIRS}
-			/usr/include /usr/local/include 
-			${FIRST_THIRD_PARTY_INCLUDE} ${SECOND_THIRD_PARTY_INCLUDE} )
-
-IF (TINYXML_BASE)
-  SET(TINYXML_FOUND TRUE)
-ENDIF (TINYXML_BASE)
-
-#FILE(TO_CMAKE_PATH ${TINYXML_BASE}/lib TINYXMLM_LIB_DIR)
-#FILE(TO_CMAKE_PATH ${TINYXML_BASE}/tinyxml TINYXML_SRC_DIR)
-#FILE(TO_CMAKE_PATH ${TINYXML_BASE}/tinyxml TINYXML_INCLUDE_DIR)
-
-SET (TINYXML_LIB_DIR ${TINYXML_BASE}/lib )
-SET (TINYXML_SRC_DIR ${TINYXML_BASE}/tinyxml)
-SET (TINYXML_INCLUDE_DIR ${TINYXML_BASE}/tinyxml)
-
-MARK_AS_ADVANCED(TINYXML_BASE)
-
-IF (TINYXML_FOUND)
-  IF (NOT TINYXML_FIND_QUIETLY)
-     MESSAGE(STATUS "Found TinyXML: ${TINYXML_INCLUDE_DIR}")
-  ENDIF (NOT TINYXML_FIND_QUIETLY)
-ELSE(TINYXML_FOUND)
-  IF (TINYXML_FIND_REQUIRED)
-     MESSAGE(FATAL_ERROR "Could not find TinyXML")
-  ENDIF (TINYXML_FIND_REQUIRED)
-ENDIF (TINYXML_FOUND)

cmake/Nektar++Config.cmake.in

@@ -63,7 +63,8 @@ ENDIF( NEKTAR_USE_MPI )
 SET(LOKI_INCLUDE_DIRS "@LOKI_CONFIG_INCLUDE_DIR@")
 SET(NEKTAR++_TP_INCLUDE_DIRS ${NEKTAR++_TP_INCLUDE_DIRS} ${LOKI_INCLUDE_DIRS})
 
-SET(TINYXML_INCLUDE_DIRS "@TINYXML_BASE@")
+SET(TINYXML_INCLUDE_DIRS "@TINYXML_CONFIG_INCLUDE_DIR@")
+
 SET(NEKTAR++_TP_INCLUDE_DIRS ${NEKTAR++_TP_INCLUDE_DIRS} ${TINYXML_ADDITIONAL_INCLUDE_DIRS})
 
 SET(FFTW_INCLUDE_DIR "@FFTW_INCLUDE_DIR@")

cmake/ThirdPartyLoki.cmake

-# Loki
+########################################################################
+#
+# ThirdParty configuration for Nektar++
+#
+# Loki headers library
+#
+########################################################################
+
+# Try to find system Loki headers. Hint /opt/local/include for MacPorts
+# (although there is no Portfile for Loki currently).
+FIND_PATH(LOKI_INCLUDE_DIR loki/Typelist.h PATHS /opt/local/include)
+
+IF (LOKI_INCLUDE_DIR)
+    SET(BUILD_LOKI OFF)
+ELSE()
+    SET(BUILD_LOKI ON)
+ENDIF()
+
 OPTION(THIRDPARTY_BUILD_LOKI
-    "Build Loki library from ThirdParty." ON)
+    "Download and extract Loki library to ThirdParty." ${BUILD_LOKI})
 
 IF (THIRDPARTY_BUILD_LOKI)
+    # Download Loki if it doesn't already exist.
     IF (NOT EXISTS ${TPSRC}/loki-0.1.3.tar.bz2)
         FILE(DOWNLOAD ${TPURL}/loki-0.1.3.tar.bz2 ${TPSRC}/loki-0.1.3.tar.bz2)
     ENDIF()
+
+    # TODO: Check hashes.
+    
+    # Extract.
     EXECUTE_PROCESS(
         COMMAND ${CMAKE_COMMAND} -E tar jxf ${TPSRC}/loki-0.1.3.tar.bz2
         WORKING_DIRECTORY ${TPSRC}
     )
+
+    # Set LOKI_INCLUDE_DIR.
+    FILE(COPY ${LOKI_INCLUDE_DIR}/loki/ DESTINATION ${TPDIST}/include/loki/)
+    SET(LOKI_INCLUDE_DIR ${TPDIST}/include CACHE PATH "" FORCE)
+
+    MESSAGE(STATUS "Build Loki: ${LOKI_INCLUDE_DIR}")
+    SET(LOKI_CONFIG_INCLUDE_DIR ${TPINC})
+ELSE()
+    MESSAGE(STATUS "Found Loki: ${LOKI_INCLUDE_DIR}")
+    SET(LOKI_CONFIG_INCLUDE_DIR ${LOKI_INCLUDE_DIR})
 ENDIF()
 
-INCLUDE (FindLoki)
 INCLUDE_DIRECTORIES(SYSTEM ${LOKI_INCLUDE_DIR})
+MARK_AS_ADVANCED(LOKI_INCLUDE_DIR)

cmake/ThirdPartyTinyxml.cmake

+########################################################################
+#
+# ThirdParty configuration for Nektar++
+#
 # TinyXML
+#
+########################################################################
+
 OPTION(NEKTAR_USE_TINYXML_STL "Use STL with TinyXML library." ON)
 MARK_AS_ADVANCED(NEKTAR_USE_TINYXML_STL)
 
+# First search for system TinyXML installs. Hint /opt/local for MacPorts.
+FIND_PATH   (TINYXML_INCLUDE_DIR tinyxml.h PATHS /opt/local/include)
+FIND_LIBRARY(TINYXML_LIBRARY NAMES "tinyxml" PATHS /opt/local/lib)
+
+# If we have our library then don't build TinyXML.
+IF (TINYXML_INCLUDE_DIR AND TINYXML_LIBRARY)
+    SET(BUILD_TINYXML OFF)
+ELSE()
+    SET(BUILD_TINYXML ON)
+ENDIF ()
+
 OPTION(THIRDPARTY_BUILD_TINYXML 
-    "Build TinyXML library from ThirdParty." ON)
+    "Build TinyXML library from ThirdParty." ${BUILD_TINYXML})
 
 IF (THIRDPARTY_BUILD_TINYXML)
     INCLUDE(ExternalProject)
@@ -25,15 +43,23 @@ IF (THIRDPARTY_BUILD_TINYXML)
             -DCMAKE_CXX_FLAGS:STRING=-DTIXML_USE_STL
             ${TPSRC}/tinyxml-2.4.3
     )
-    SET(TINYXML_LIB tinyxml CACHE FILEPATH 
-        "Tinyxml library" FORCE)
-    MARK_AS_ADVANCED(TINYXML_LIB)
+    SET(TINYXML_LIBRARY tinyxml CACHE FILEPATH
+        "TinyXML library" FORCE)
+    SET(TINYXML_INCLUDE_DIR ${TPDIST}/include CACHE FILEPATH
+        "TinyXML include" FORCE)
+
     LINK_DIRECTORIES(${TPDIST}/lib)
-    INCLUDE_DIRECTORIES(${TPDIST}/include)
-ELSE (THIRDPARTY_BUILD_TINYXML)
-    INCLUDE (FindTinyXml)
-ENDIF (THIRDPARTY_BUILD_TINYXML)
 
+    MESSAGE(STATUS "Build TinyXML: ${TPDIST}/${TINYXML_LIBRARY}.a")
+    SET(TINYXML_CONFIG_INCLUDE_DIR ${TPINC})
+ELSE()
+    ADD_CUSTOM_TARGET(tinyxml-2.4.3 ALL)
 
+    MESSAGE(STATUS "Found TinyXML: ${TINYXML_LIBRARY}")
+    SET(TINYXML_CONFIG_INCLUDE_DIR ${TINYXML_INCLUDE_DIR})
+ENDIF (THIRDPARTY_BUILD_TINYXML)
 
+INCLUDE_DIRECTORIES(SYSTEM ${TINYXML_INCLUDE_DIR})
 
+MARK_AS_ADVANCED(TINYXML_INCLUDE_DIR)
+MARK_AS_ADVANCED(TINYXML_LIBRARY)
\ No newline at end of file

library/Demos/MultiRegions/ExtraDemos/TimingCGHelmSolve2D.cpp

 #include <sstream>
 #include <time.h>
 
-//#define SHARK
-
 #include <sys/time.h>
-#ifdef SHARK
-#include <CHUD/CHUD.h> 
-#endif
 #include <LibUtilities/BasicUtils/SessionReader.h>
 #include <LibUtilities/Communication/Comm.h>
 #include <SpatialDomains/MeshPartition.h>
@@ -377,16 +372,6 @@ int main(int argc, char *argv[])
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);	
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("NektarppTimingCGHelmSolve2D");
-#endif
-
     gettimeofday(&timer1, NULL);
     for(i = 0; i < NumCalls; ++i)
     {
@@ -395,12 +380,6 @@ int main(int argc, char *argv[])
     }
     gettimeofday(&timer2, NULL);
 
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);
     exeTime = (time2-time1);

library/Demos/MultiRegions/ExtraDemos/TimingHDGHelmSolve2D.cpp

 #include <sstream>
 #include <time.h>
 
-//#define SHARK
-
 #include <sys/time.h>
-#ifdef SHARK
-#include <CHUD/CHUD.h> 
-#endif
 #include <LibUtilities/BasicUtils/SessionReader.h>
 #include <LibUtilities/Communication/Comm.h>
 #include <SpatialDomains/MeshPartition.h>
@@ -407,16 +402,6 @@ int main(int argc, char *argv[])
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);	
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("NektarppTimingCGHelmSolve2D");
-#endif
-
     gettimeofday(&timer1, NULL);
     for(i = 0; i < NumCalls; ++i)
     {
@@ -425,13 +410,6 @@ int main(int argc, char *argv[])
     }
     gettimeofday(&timer2, NULL);
 
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
-
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);
     exeTime = (time2-time1);

library/Demos/SpatialDomains/CMakeLists.txt

@@ -5,7 +5,7 @@ SET(LinkLibraries
     optimized ${Boost_THREAD_LIBRARY_RELEASE} debug ${Boost_THREAD_LIBRARY_DEBUG}
     optimized ${Boost_IOSTREAMS_LIBRARY_RELEASE} debug ${Boost_IOSTREAMS_LIBRARY_DEBUG}
     optimized ${Boost_ZLIB_LIBRARY_RELEASE} debug ${Boost_ZLIB_LIBRARY_DEBUG}
-    optimized ${TINYXML_LIB} debug ${TINYXML_LIB}
+    optimized ${TINYXML_LIBRARY} debug ${TINYXML_LIBRARY}
 )
 
 #SET(SpatialDomains1DSource  Graph1D.cpp)

library/LibUtilities/CMakeLists.txt

@@ -388,7 +388,7 @@ TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC
 )
 
 # TinyXML
-TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${TINYXML_LIB})
+TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${TINYXML_LIBRARY})
 IF( ${CMAKE_SYSTEM} MATCHES "Linux.*" )
     TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC rt)
 ENDIF()
@@ -422,10 +422,6 @@ IF( NEKTAR_USE_BLAS_LAPACK )
         TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${ACCELERATE_FRAMEWORK_LINK_FLAGS})
     ENDIF ( NEKTAR_USE_ACCELERATE_FRAMEWORK )
 
-    IF( NEKTAR_USE_CHUD_FRAMEWORK )
-        TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${CHUD_FRAMEWORK_LINK_FLAGS})
-    ENDIF ( NEKTAR_USE_CHUD_FRAMEWORK )
-
     IF( NEKTAR_USE_WIN32_LAPACK )
         TARGET_LINK_LIBRARIES(LibUtilities LINK_PUBLIC ${WIN32_LAPACK} ${WIN32_BLAS})
         INSTALL(FILES ${WIN32_LAPACK_DLL} ${WIN32_BLAS_DLL}

library/Timings/TimingCGGeneralMatrixOp3D.cpp

@@ -7,11 +7,6 @@
 #include <SpatialDomains/MeshGraph3D.h>
 #include <MultiRegions/ContField3D.h>
 
-#ifdef NEKTAR_USING_CHUD
-#include <CHUD/CHUD.h>
-//#define SHARK
-#endif
-
 using namespace Nektar;
 
 NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
@@ -494,15 +489,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("TimingCGHelmSolve2D");
-#endif
     gettimeofday(&timer1, NULL);
     if (type == StdRegions::eBwdTrans)
     {
@@ -532,12 +518,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
         }
     }
     gettimeofday(&timer2, NULL);
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
 
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);

library/Timings/TimingCGHelmSolve2D.cpp

@@ -7,11 +7,6 @@
 #include <SpatialDomains/MeshGraph2D.h>
 #include <MultiRegions/ContField2D.h>
 
-#ifdef NEKTAR_USING_CHUD
-#include <CHUD/CHUD.h> 
-//#define SHARK
-#endif 
-
 using namespace Nektar;
 
 std::string PortablePath(const boost::filesystem::path& path);
@@ -360,16 +355,6 @@ int main(int argc, char *argv[])
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);    
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("TimingCGHelmSolve2D");
-#endif
-
     gettimeofday(&timer1, NULL);
     for(i = 0; i < NumCalls; ++i)
     {
@@ -379,13 +364,6 @@ int main(int argc, char *argv[])
     }
     gettimeofday(&timer2, NULL);
 
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
-
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);
     exeTime = (time2-time1);

library/Timings/TimingCGHelmSolve3D.cpp

@@ -7,11 +7,6 @@
 #include <SpatialDomains/MeshGraph3D.h>
 #include <MultiRegions/ContField3D.h>
 
-#ifdef NEKTAR_USING_CHUD
-#include <CHUD/CHUD.h> 
-//#define SHARK
-#endif 
-
 using namespace Nektar;
 
 std::string PortablePath(const boost::filesystem::path& path);
@@ -373,16 +368,6 @@ int main(int argc, char *argv[])
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);    
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("TimingCGHelmSolve3D");
-#endif
-
     gettimeofday(&timer1, NULL);
     for(i = 0; i < NumCalls; ++i)
     {
@@ -392,13 +377,6 @@ int main(int argc, char *argv[])
     }
     gettimeofday(&timer2, NULL);
 
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
-
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);
     exeTime = (time2-time1);

library/Timings/TimingGeneralMatrixOp2D.cpp

@@ -7,11 +7,6 @@
 #include <SpatialDomains/MeshGraph2D.h>
 #include <MultiRegions/ContField2D.h>
 
-#ifdef NEKTAR_USING_CHUD
-#include <CHUD/CHUD.h> 
-//#define SHARK
-#endif 
-
 using namespace Nektar;
 
 NekDouble TimeMatrixOp(StdRegions::MatrixType &type, 
@@ -445,16 +440,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);   
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("TimingCGHelmSolve2D");
-#endif
-
     gettimeofday(&timer1, NULL);
     if (type == StdRegions::eBwdTrans)
     {
@@ -486,13 +471,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
     }
     gettimeofday(&timer2, NULL);
 
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
-
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);
     exeTime = (time2-time1);

library/Timings/TimingGeneralMatrixOp3D.cpp

@@ -7,11 +7,6 @@
 #include <SpatialDomains/MeshGraph3D.h>
 #include <MultiRegions/ContField3D.h>
 
-#ifdef NEKTAR_USING_CHUD
-#include <CHUD/CHUD.h>
-//#define SHARK
-#endif
-
 using namespace Nektar;
 
 NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
@@ -436,16 +431,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
         NumCalls = 1;
     }
 
-#ifdef SHARK
-    NumCalls *= 20;
-
-    chudInitialize();
-    chudSetErrorLogFile(stderr);
-    chudUmarkPID(getpid(), TRUE);
-    chudAcquireRemoteAccess();
-    chudStartRemotePerfMonitor("TimingCGHelmSolve2D");
-#endif
-
     gettimeofday(&timer1, NULL);
     if (type == StdRegions::eBwdTrans)
     {
@@ -476,13 +461,6 @@ NekDouble TimeMatrixOp(StdRegions::MatrixType &type,
     }
     gettimeofday(&timer2, NULL);
 
-#ifdef SHARK
-    chudStopRemotePerfMonitor();
-    chudReleaseRemoteAccess();
-    chudCleanup();
-#endif
-
-
     time1 = timer1.tv_sec*1000000.0+(timer1.tv_usec);
     time2 = timer2.tv_sec*1000000.0+(timer2.tv_usec);
     exeTime = (time2-time1);

library/Timings/TimingHDGHelmSolve2D.cpp

@@ -7,11 +7,6 @@
 #include <SpatialDomains/MeshGraph2D.h>
 #include <MultiRegions/DisContField2D.h>
 
-#ifdef NEKTAR_USING_CHUD
-#include <CHUD/CHUD.h> 
-//#define SHARK
-#endif 
-
 using namespace Nektar;