Merge branch 'master' into tensorflow

awni · Nov 2, 2016 · 13d1e16 · 13d1e16
2 parents 99c0da5 + b3e398a
commit 13d1e16
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/include/ctc.h b/include/ctc.h
@@ -21,6 +21,9 @@ typedef enum {
     CTC_STATUS_UNKNOWN_ERROR = 4
 } ctcStatus_t;
 
+/** Returns a single integer which specifies the API version of the warpctc library */
+int get_warpctc_version();
+
 /** Returns a string containing a description of status that was passed in
  *  \param[in] status identifies which string should be returned
  *  \return C style string containing the text description

diff --git a/src/ctc_entrypoint.cpp b/src/ctc_entrypoint.cpp
@@ -12,6 +12,10 @@
 
 extern "C" {
 
+int get_warpctc_version() {
+    return 1;
+}
+
 const char* ctcGetStatusString(ctcStatus_t status) {
     switch (status) {
     case CTC_STATUS_SUCCESS:

diff --git a/tests/test_cpu.cpp b/tests/test_cpu.cpp
@@ -366,6 +366,11 @@ bool run_tests() {
 }
 
 int main(void) {
+    if (get_warpctc_version() != 1) {
+        std::cerr << "Invalid WarpCTC version." << std::endl;
+        return 1;
+    }
+
     std::cout << "Running CPU tests" << std::endl;
 
     bool status = true;
@@ -374,8 +379,11 @@ int main(void) {
     status &= inf_test();
     status &= run_tests();
 
-    if (status)
+    if (status) {
         std::cout << "Tests pass" << std::endl;
-    else
+        return 0;
+    } else {
         std::cout << "Some or all tests fail" << std::endl;
+        return 1;
+    }
 }
diff --git a/tests/test_gpu.cu b/tests/test_gpu.cu
@@ -478,6 +478,11 @@ bool run_tests() {
 }
 
 int main(void) {
+    if (get_warpctc_version() != 1) {
+        std::cerr << "Invalid WarpCTC version." << std::endl;
+        return 1;
+    }
+
     std::cout << "Running GPU tests" << std::endl;
     throw_on_error(cudaSetDevice(0), "cudaSetDevice");
 
@@ -487,8 +492,11 @@ int main(void) {
     status &= inf_test();
     status &= run_tests();
 
-    if (status)
+    if (status) {
         std::cout << "Tests pass" << std::endl;
-    else
+        return 0;
+    } else {
         std::cout << "Some or all tests fail" << std::endl;
+        return 1;
+    }
 }