revert nogil changes. spooky

proycon · Dec 11, 2024 · 9de6b67 · 9de6b67
1 parent 1c657b3
commit 9de6b67
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/colibricore_classes.in.pxd b/colibricore_classes.in.pxd
@@ -259,10 +259,10 @@ cdef extern from "patternstore.h":
         Pattern getpattern(IndexReference&,int)  except +KeyError #PatternPointer in reality
         vector[pair[IndexReference,PatternPointer]] findpattern(Pattern,int sentence,bool instantiate) nogil #high level
         PatternPointer getinstance(IndexReference begin, PatternPointer pattern) nogil #low level (alias for findpattern), returns ngrams since outputcategory uses default parameter NGRAM  in C++ code
-        int operator[](IndexReference&) except +KeyError nogil
+        int operator[](IndexReference&) nogil except +KeyError
         int sentencelength(int) nogil
         int sentences() nogil
-        Pattern getsentence(int) except +KeyError nogil #PatternPointer in reality
+        Pattern getsentence(int) nogil except +KeyError #PatternPointer in reality
 
     cdef cppclass AlignedPatternMap[ValueType, ValueHandler, NestedSizeType]:
         cppclass iterator:
@@ -292,24 +292,24 @@ cdef extern from "patternstore.h":
 
 cdef extern from "classdecoder.h":
     cdef cppclass ClassDecoder:
-        ClassDecoder() except + nogil
-        ClassDecoder(string&) except + nogil
+        ClassDecoder() nogil except +
+        ClassDecoder(string&) nogil except +
         void load(string&) nogil
         int size() nogil
         string decodefiletostring(string&,  int begin = 0, int end = 0, bool quiet = False) nogil
 
 cdef extern from "classencoder.h":
     cdef cppclass ClassEncoder:
-        ClassEncoder(int minlength=0, int maxlength=0) except + nogil
-        ClassEncoder(string, int minlength=0, int maxlength=0) except + nogil
+        ClassEncoder(int minlength=0, int maxlength=0) nogil except +
+        ClassEncoder(string, int minlength=0, int maxlength=0) nogil except +
         void load(string, int minlength, int maxlength) nogil
         int size() nogil
         void processcorpus(string filename, unordered_map[string,unsigned int]) nogil
         void buildclasses(unordered_map[string,unsigned int] & , int threshold=0) nogil
         void build(string& filename,int threshold=0) nogil #build a class from this dataset
         void encodefile(string&, string&, bool allowunknown, bool autoaddunknown, bool append,bool ignorenewlines, bool quiet) nogil
         void save(string&)
-        Pattern buildpattern(string&, bool allowunknown, bool autoaddunknown) except + nogil
+        Pattern buildpattern(string&, bool allowunknown, bool autoaddunknown) nogil except +
 
 cdef extern from "patternmodel.h":
     cdef cppclass PatternModelOptions:
@@ -374,8 +374,8 @@ cdef extern from "patternmodel.h":
 
         void insert(Pattern&) nogil
 
-        void load(string, PatternModelOptions) except +IOError nogil
-        void write(string) except +IOError nogil
+        void load(string, PatternModelOptions) nogil except +IOError
+        void write(string) nogil except +IOError
 
     cdef cppclass PatternModel[ValueType,ValueHandler,MapType]:
         cppclass iterator:
@@ -416,8 +416,8 @@ cdef extern from "patternmodel.h":
         bool erase(Pattern&) nogil
         unsigned int prune(int threshold, int n) nogil
         iterator find(Pattern&) nogil
-        void load(string, PatternModelOptions, PatternModelInterface*) except +IOError nogil
-        void write(string) except +IOError nogil
+        void load(string, PatternModelOptions, PatternModelInterface*) nogil except +IOError
+        void write(string) nogil except +IOError
         void printmodel(ostream, ClassDecoder&) nogil
         void printpattern(ostream, ClassDecoder&, Pattern&,bool instantiate=false,bool eol=true) nogil
         void report(ostream) nogil
@@ -484,8 +484,8 @@ cdef extern from "patternmodel.h":
         bool erase(Pattern&) nogil
         unsigned int prune(int threshold, int n) nogil
         iterator find(Pattern&) nogil
-        void load(string, PatternModelOptions, PatternModelInterface* ) except +IOError nogil
-        void write(string) except +IOError nogil
+        void load(string, PatternModelOptions, PatternModelInterface* ) nogil except +IOError
+        void write(string) nogil except +IOError
         void printmodel(ostream, ClassDecoder&) nogil
         void printpattern(ostream, ClassDecoder&, Pattern&,bool instantiate=false,bool eol=true) nogil
         void report(ostream) nogil
@@ -548,8 +548,8 @@ cdef extern from "alignmodel.h":
         iterator erase(Pattern&) nogil
         iterator find(Pattern&) nogil
 
-        void load(string&, PatternModelOptions) except +IOError nogil
-        void write(string&) except +IOError nogil
+        void load(string&, PatternModelOptions) nogil except +IOError
+        void write(string&) nogil except +IOError
 
     cdef cppclass BasicPatternAlignmentModel:
         cppclass iterator:
@@ -582,5 +582,5 @@ cdef extern from "alignmodel.h":
         iterator erase(Pattern&) nogil
         iterator find(Pattern&) nogil
 
-        void load(string&, PatternModelOptions) except +IOError nogil
-        void write(string&) except +IOError nogil
+        void load(string&, PatternModelOptions) nogil except +IOError
+        void write(string&) nogil except +IOError