Remove dummy OpenMP Op and rollback OpenMP changes in CTC wrapper

theano/tensor/nnet/ctc.py

@@ -21,9 +21,6 @@ class ConnectionistTemporalClassification(gof.COp):
     def __init__(self, compute_grad=True):
         super(ConnectionistTemporalClassification, self).__init__(self.func_file,
                                                                   self.func_name)
-        # Instantiate dummy OpenMP Op to check OpenMP support, pull headers and
-        # compilation options
-        self.openmp_op = gof.OpenMPOp()
 
         self.compute_grad = compute_grad
         self.costs = T.fvector(name="ctc_cost")
@@ -35,9 +32,6 @@ class ConnectionistTemporalClassification(gof.COp):
                              'to the root directory of the CTC library in '
                              'your system.')
 
-    def c_compile_args(self):
-        return self.openmp_op.c_compile_args()
-
     def c_lib_dirs(self):
         dirs = []
         if ctc_enabled:
@@ -58,7 +52,7 @@ class ConnectionistTemporalClassification(gof.COp):
         return dirs
 
     def c_headers(self):
-        return ["ctc.h"] + self.openmp_op.c_headers()
+        return ["ctc.h"]
 
     def make_node(self, activations, labels, input_lengths=None):
         if not ctc_enabled:

theano/tensor/nnet/ctc_wrapper.c

@@ -187,11 +187,7 @@ int APPLY_SPECIFIC(ctc_cost_cpu)(PyArrayObject *  in_activations,
     ctcOptions ctc_options;
     memset( &ctc_options, 0, sizeof(ctcOptions) );
     ctc_options.loc = CTC_CPU;
-#if defined(_OPENMP)
-    ctc_options.num_threads = omp_get_num_threads();
-#else
     ctc_options.num_threads = 1;
-#endif
 
     size_t cpu_workspace_size;
     int ctc_error;