Code portability

Author: joaopauloschuler

neural/neuraltokenizer.pas

@@ -17,8 +17,7 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 *)
 unit neuraltokenizer;
-
-{$mode ObjFPC}{$H+}
+{$include neuralnetwork.inc}
 
 interface
 
@@ -33,10 +32,10 @@ interface
   TNeuralTokenizer = class(TStringListInt)
     public
       function GetVocabCount(): integer; override;
-      procedure Tokenize(const pText: string; Result: TIntegerList);
-      procedure Tokenize(pString: string; var IntArr: TNeuralIntegerArray); override; overload;
+      procedure Tokenize(const pText: string; Result: TIntegerList); overload;
+      procedure Tokenize(pString: string; var IntArr: TNeuralIntegerArray); overload; override;
       procedure TokenizeWord(const pText: string; Result: TIntegerList);
-      function DeTokenize(TokenId: integer): string; override; overload;
+      function DeTokenize(TokenId: integer): string; overload; override;
       function DeTokenize(TokenIds: TIntegerList): string; overload;
       function TokenizerHasSeparator: boolean; override;
 

neural/neuralvolume.pas

@@ -694,8 +694,8 @@   TStringListInt = class(TNNetStringList)
       function IntegerArrayToString(var IntArr: TNeuralIntegerArray): string;
       function IntegerListToCsv(IL: TIntegerList; pDelimiter: char = ','): string;
 
-      function DeTokenize(TokenId: integer): string; virtual; overload;
-      procedure Tokenize(pString: string; var IntArr: TNeuralIntegerArray); virtual; overload;
+      function DeTokenize(TokenId: integer): string; virtual;
+      procedure Tokenize(pString: string; var IntArr: TNeuralIntegerArray); overload; virtual;
       function GetVocabCount(): integer; virtual;
       function TokenizerHasSeparator: boolean; virtual;
 
@@ -11561,6 +11561,8 @@ procedure TNNetVolume.CopyNoChecks(Original: TNNetVolume);
   asm_dword_copy;
 end;
 
+{$ENDIF} // of AVXANY
+
 { TNNetGroupedVolume }
 
 destructor TNNetGroupedVolume.Destroy;
@@ -11569,8 +11571,6 @@ destructor TNNetGroupedVolume.Destroy;
   inherited Destroy;
 end;
 
-{$ENDIF}
-
 class function TVolume.DotProduct(PtrA, PtrB: TNeuralFloatArrPtr; NumElements: integer
   ): Single;
 var