Skip to content

Commit

Permalink
Added missing exceptions, renamed GTC tutorial files.
Browse files Browse the repository at this point in the history
  • Loading branch information
neoblizz committed May 1, 2019
1 parent cc5a8a7 commit 07814ff
Show file tree
Hide file tree
Showing 21 changed files with 112 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ doxygen/html
unittests/*/*.txt
examples/*/*.txt

# exceptions for ignore
!unittests/*/CMakeLists.txt
!examples/*/CMakeLists.txt

# Ignore vim temp files
*.sw~

Expand Down
10 changes: 10 additions & 0 deletions examples/color/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Graph Coloring
# ------------------------------------------------------------------------
project(color)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)

add_test(NAME TEST_COLOR COMMAND color market
${gunrock_INCLUDE_DIRS}/dataset/small/chesapeake.mtx --undirected)
set_tests_properties(TEST_COLOR PROPERTIES PASS_REGULAR_EXPRESSION "0 errors occurred.")
6 changes: 6 additions & 0 deletions examples/geo/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Geolocation
# ------------------------------------------------------------------------
project(geo)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/gtc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project GPU TECH CONF. TUTORIAL (SSSP)
# ------------------------------------------------------------------------
project(gtc)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
2 changes: 1 addition & 1 deletion examples/gtc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#-------------------------------------------------------------------------------

include ../BaseMakefile.mk
ALGO = sssp
ALGO = gtc
EXEC = bin/test_$(ALGO)_$(NVCC_VERSION)_$(ARCH_SUFFIX)

test: $(EXEC)
Expand Down
4 changes: 2 additions & 2 deletions examples/gtc/test_sssp.cu
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

/**
* @file
* test_sssp.cu
* test_gtc.cu
*
* @brief Simple test driver program for single source shortest path.
*/

#include <gunrock/app/gtc/sssp_app.cu>
#include <gunrock/app/gtc/gtc_app.cu>
#include <gunrock/app/test_base.cuh>

using namespace gunrock;
Expand Down
6 changes: 6 additions & 0 deletions examples/gtf/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Graph Trend Filtering
# ------------------------------------------------------------------------
project(gtf)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/hello/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Hello World Tutorial (Gunrock)
# ------------------------------------------------------------------------
project(hello)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
10 changes: 10 additions & 0 deletions examples/knn/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project k-Nearest Neighbor (& Shared Nearest Neighbor)
# ------------------------------------------------------------------------
project(knn)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)

add_test(NAME TEST_KNN COMMAND knn market
${gunrock_INCLUDE_DIRS}/dataset/small/chesapeake.mtx --k=5)
set_tests_properties(TEST_KNN PROPERTIES PASS_REGULAR_EXPRESSION "PASSED KNN")
12 changes: 12 additions & 0 deletions examples/louvain/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Louvain Community Detection
# ------------------------------------------------------------------------
project(louvain)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)

add_test(NAME TEST_LOUVAIN COMMAND louvain market
${gunrock_INCLUDE_DIRS}/dataset/small/chesapeake.mtx
--omp-threads=32 --advance-mode=ALL_EDGES --unify-segments=true)
set_tests_properties(TEST_LOUVAIN PROPERTIES PASS_REGULAR_EXPRESSION "PASS")

6 changes: 6 additions & 0 deletions examples/mf/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project MaxFlow
# ------------------------------------------------------------------------
project(mf)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/pr_nibble/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Local Graph Clustering (PR Nibble)
# ------------------------------------------------------------------------
project(pr_nibble)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/proj/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Graph Projection
# ------------------------------------------------------------------------
project(proj)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/sage/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Graph Sage
# ------------------------------------------------------------------------
project(sage)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/sm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Sub-Graph Matching
# ------------------------------------------------------------------------
project(sm)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/ss/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Scan Statistics
# ------------------------------------------------------------------------
project(ss)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 6 additions & 0 deletions examples/vn/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# ------------------------------------------------------------------------
# Gunrock: Sub-Project Vertex Nomination
# ------------------------------------------------------------------------
project(vn)
message("-- Project Added: ${PROJECT_NAME}")
include(${CMAKE_SOURCE_DIR}/cmake/SetSubProject.cmake)
6 changes: 3 additions & 3 deletions gunrock/app/gtc/sssp_app.cu → gunrock/app/gtc/gtc_app.cu
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// ----------------------------------------------------------------------------

/**
* @file sssp_app.cu
* @file gtc_app.cu
*
* @brief single-source shortest path (SSSP) application
*/
Expand All @@ -22,8 +22,8 @@
#include <gunrock/app/test_base.cuh>

// single-source shortest path includes
#include <gunrock/app/gtc/sssp_enactor.cuh>
#include <gunrock/app/gtc/sssp_test.cuh>
#include <gunrock/app/gtc/gtc_enactor.cuh>
#include <gunrock/app/gtc/gtc_test.cuh>

namespace gunrock {
namespace app {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/**
* @file
* sssp_enactor.cuh
* gtc_enactor.cuh
*
* @brief SSSP Problem Enactor
*/
Expand All @@ -17,7 +17,7 @@
#include <gunrock/app/enactor_base.cuh>
#include <gunrock/app/enactor_iteration.cuh>
#include <gunrock/app/enactor_loop.cuh>
#include <gunrock/app/gtc/sssp_problem.cuh>
#include <gunrock/app/gtc/gtc_problem.cuh>
#include <gunrock/oprtr/oprtr.cuh>

namespace gunrock {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/**
* @file
* sssp_problem.cuh
* gtc_problem.cuh
*
* @brief GPU Storage management Structure for SSSP Problem Data
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/**
* @file
* sssp_test.cu
* gtc_test.cu
*
* @brief Test related functions for SSSP
*/
Expand Down

0 comments on commit 07814ff

Please sign in to comment.