Merge branch 'master' into gensimgensim

2 files changed, 1 insertions, 4 deletions

diff --git a/bicleaner_ai/bicleaner_ai_classifier.py b/bicleaner_ai/bicleaner_ai_classifier.py
index e038d25..0d5f6c8 100755
--- a/bicleaner_ai/bicleaner_ai_classifier.py
+++ b/bicleaner_ai/bicleaner_ai_classifier.py
@@ -14,16 +14,15 @@ import logging
 import traceback
 
 from timeit import default_timer
+from multiprocessing import cpu_count
 
 #Allows to load modules while inside or outside the package
 try:
     from .classify import classify, argument_parser, load_metadata
     from .util import logging_setup
-    from .tokenizer import Tokenizer
 except (ImportError, SystemError):
     from classify import classify, argument_parser, load_metadata
     from util import logging_setup
-    from tokenizer import Tokenizer
 
 logging_level = 0
 
diff --git a/bicleaner_ai/bicleaner_ai_train.py b/bicleaner_ai/bicleaner_ai_train.py
index 2eb6972..7490b56 100755
--- a/bicleaner_ai/bicleaner_ai_train.py
+++ b/bicleaner_ai/bicleaner_ai_train.py
@@ -26,13 +26,11 @@ try:
     from .word_freqs_zipf_double_linked import WordZipfFreqDistDoubleLinked
     from .util import *
     from .training import build_noise, write_metadata
-    from .tokenizer import Tokenizer
 except (SystemError, ImportError):
     from word_freqs_zipf import WordZipfFreqDist
     from word_freqs_zipf_double_linked import WordZipfFreqDistDoubleLinked
     from util import *
     from training import build_noise, write_metadata
-    from tokenizer import Tokenizer
 
 logging_level = 0