[PrematureStopping] Remove sg_global_cancel_computation.

shogun-toolbox · Jul 8, 2017 · f390c72 · f390c72
1 parent 25a4732
commit f390c72
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 83 deletions.
diff --git a/src/interfaces/csharp/sg_print_functions.cpp b/src/interfaces/csharp/sg_print_functions.cpp
@@ -15,7 +15,3 @@ void sg_global_print_error(FILE* target, const char* str)
 {
 	fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-}
diff --git a/src/interfaces/java/sg_print_functions.cpp b/src/interfaces/java/sg_print_functions.cpp
@@ -15,7 +15,3 @@ void sg_global_print_error(FILE* target, const char* str)
 {
 	fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-}
diff --git a/src/interfaces/lua/sg_print_functions.cpp b/src/interfaces/lua/sg_print_functions.cpp
@@ -15,7 +15,3 @@ void sg_global_print_error(FILE* target, const char* str)
 {
 	fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-}
diff --git a/src/interfaces/octave/sg_print_functions.cpp b/src/interfaces/octave/sg_print_functions.cpp
@@ -29,7 +29,3 @@ void sg_global_print_error(FILE* target, const char* str)
 {
 	fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-}
diff --git a/src/interfaces/perl/sg_print_functions.cpp b/src/interfaces/perl/sg_print_functions.cpp
@@ -40,32 +40,3 @@ void sg_global_print_error(FILE* target, const char* str)
 	else
 		fprintf(target, "%s", str);
 }
-
-// PTZ121009 used in threads...so cannot access stdin like this...
-// why not checking kill stuff???
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-#if 0
-	using namespace shogun;
-
-	dTHX;       /* fetch context */
-	//PerlIO_init(pTHX);
-	//  PerlIO *f = PerlIO_stdin(); crashes in Perl_csighandler () from /usr/lib/libperl.so.5.14
-
-	if(!f) {return;}
-	if(PerlIO_flush(f)) //check signal
-	{
-		SG_SPRINT("\nImmediately return to matlab prompt / Prematurely finish computations / Do nothing (I/P/D)? ");
-		char answer= PerlIO_getc(f);
-		if (answer == 'I')
-			immediately=true;
-		else if (answer == 'P')
-		{
-			PerlIO_clearerr(f);
-			delayed=true;
-		}
-		else
-			SG_SPRINT("\n");
-	}
-#endif
-}
diff --git a/src/interfaces/python/sg_print_functions.cpp b/src/interfaces/python/sg_print_functions.cpp
@@ -34,28 +34,3 @@ void sg_global_print_error(FILE* target, const char* str)
 	else
 		fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-	using namespace shogun;
-
-	PyGILState_STATE gil = PyGILState_Ensure();
-	if (PyErr_CheckSignals())
-	{
-		SG_SPRINT(
-		    "\nImmediately return to prompt / Prematurely finish "
-		    "computations / Do nothing (I/P/D)? ");
-		char answer = fgetc(stdin);
-
-		if (answer == 'I')
-			immediately = true;
-		else if (answer == 'P')
-		{
-			PyErr_Clear();
-			delayed = true;
-		}
-		else
-			SG_SPRINT("\n");
-	}
-	PyGILState_Release(gil);
-}
diff --git a/src/interfaces/r/sg_print_functions.cpp b/src/interfaces/r/sg_print_functions.cpp
@@ -32,8 +32,3 @@ void sg_global_print_error(FILE* target, const char* str)
 	else
 		fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-	/* R_Suicide((char*) "sg stopped by SIGINT\n"); */
-}
diff --git a/src/interfaces/ruby/sg_print_functions.cpp b/src/interfaces/ruby/sg_print_functions.cpp
@@ -15,7 +15,3 @@ void sg_global_print_error(FILE* target, const char* str)
 {
 	fprintf(target, "%s", str);
 }
-
-void sg_global_cancel_computations(bool& delayed, bool& immediately)
-{
-}
diff --git a/src/interfaces/swig/SGBase.i b/src/interfaces/swig/SGBase.i
@@ -111,9 +111,6 @@ public void readExternal(java.io.ObjectInput in) throws java.io.IOException, jav
  extern void sg_global_print_message(FILE* target, const char* str);
  extern void sg_global_print_warning(FILE* target, const char* str);
  extern void sg_global_print_error(FILE* target, const char* str);
-#ifndef DISABLE_CANCEL_CALLBACK
- extern void sg_global_cancel_computations(bool &delayed, bool &immediately);
-#endif
 
 #ifdef SWIGR
  #include <Rdefines.h>
@@ -162,7 +159,7 @@ public void readExternal(java.io.ObjectInput in) throws java.io.IOException, jav
 #if !defined(SWIGJAVA) && !defined(SWIGCSHARP)
 #ifndef DISABLE_CANCEL_CALLBACK
         shogun::init_shogun(&sg_global_print_message, &sg_global_print_warning,
-                &sg_global_print_error, &sg_global_cancel_computations);
+                &sg_global_print_error);
 #else
         shogun::init_shogun(&sg_global_print_message, &sg_global_print_warning,
                 &sg_global_print_error);