diff --git a/Code/Exec.py b/Code/Exec.py index ba09d2309a60b0f2f7d4a39eb3ec1617f1a4c5d5..8bf6c5769aafc5fb9a13fb4cb60c19c075fabdb1 100644 --- a/Code/Exec.py +++ b/Code/Exec.py @@ -1,3 +1,5 @@ +from Versions import testVersions +testVersions() import sys from MonoMultiViewClassifiers import ExecClassif diff --git a/Code/MonoMultiViewClassifiers/ExecClassif.py b/Code/MonoMultiViewClassifiers/ExecClassif.py index caea0c6eb842d20313e32964dfcc2adfa28f2568..8758ddf74d67495bf57e0e96606b48f3306a965f 100644 --- a/Code/MonoMultiViewClassifiers/ExecClassif.py +++ b/Code/MonoMultiViewClassifiers/ExecClassif.py @@ -22,7 +22,6 @@ from . import MonoviewClassifiers from .Multiview.ExecMultiview import ExecMultiview, ExecMultiview_multicore from .Monoview.ExecClassifMonoView import ExecMonoview, ExecMonoview_multicore from .Multiview import GetMultiviewDb as DB -from Versions import testVersions from ResultAnalysis import resultAnalysis, analyzeLabels, analyzeIterResults from .utils import execution, Dataset @@ -273,7 +272,6 @@ def classifyOneIter(LABELS_DICTIONARY, argumentDictionaries, nbCores, directory, # _______________ # def execClassif(arguments): # import pdb;pdb.set_trace() - testVersions() start = time.time() args = execution.parseTheArgs(arguments) diff --git a/Code/MonoMultiViewClassifiers/Versions.py b/Code/MonoMultiViewClassifiers/Versions.py deleted file mode 100644 index 4dd66d142a0ba4c793f8bf0e80842bf07ce9f968..0000000000000000000000000000000000000000 --- a/Code/MonoMultiViewClassifiers/Versions.py +++ /dev/null @@ -1,97 +0,0 @@ -#!/usr/bin/env python - -""" Script to render versions of modules used """ - -# Import built-in modules - -# Import 3rd party modules - -# Import own modules - - -# Author-Info -__author__ = "Nikolas Huelsmann, Baptiste BAUVIN" -__status__ = "Prototype" # Production, Development, Prototype -__date__ = 2016 - 03 - 25 - - -def testVersions(): - try: - import sys - # print("Python-V.: " + sys.version) - except: - print "Please install Python 2.7" - raise - try: - import pyscm - except: - print "Please install pyscm" - raise - - # try: - # import cv2 - # # print("OpenCV2-V.: " + cv2.__version__) - # except: - # print "Please install cv2 module" - - try: - import pandas - # print("Pandas-V.: " + pd.__version__) - except: - print "Please install pandas module" - - try: - import numpy - # print("Numpy-V.: " + numpy.version.version) - except: - print "Please install numpy module" - raise - - try: - import scipy - # print("Scipy-V.: " + scipy.__version__) - except: - print "Please install scipy module" - raise - - try: - import matplotlib - # print("Matplotlib-V.: " + matplotlib.__version__) - except: - print "Please install matplotlib module" - raise - - try: - import sklearn - # print("Sklearn-V.: " + sklearn.__version__) - except: - print "Please install sklearn module" - raise - - try: - import logging # To create Log-Files - # print("Logging: " + logging.__version__) - except: - print "Please install logging module" - raise - - try: - import joblib - # print("joblib: " + joblib.__version__) - except: - print "Pease install joblib module" - raise - - try: - import argparse - # print("argparse: " + argparse.__version__) - except: - print "Pease install argparse module" - raise - - try: - import h5py # - # print("h5py: " + h5py.__version__) - except: - print "Pease install h5py module" - raise diff --git a/Code/MonoMultiViewClassifiers/__init__.py b/Code/MonoMultiViewClassifiers/__init__.py index 8c1b85294a3a36c3f0c2e1fad9e41e12969cd719..7ad3b16339dd0c1ebceda2572deba6f93b0a3a09 100644 --- a/Code/MonoMultiViewClassifiers/__init__.py +++ b/Code/MonoMultiViewClassifiers/__init__.py @@ -1,2 +1,3 @@ -from . import ExecClassif, ResultAnalysis, Versions, Metrics, MonoviewClassifiers, Monoview, Multiview, utils +from . import ExecClassif, ResultAnalysis, Metrics, MonoviewClassifiers, Monoview, Multiview, utils + __all__ = ['Metrics', 'Monoview', 'MonoviewClassifiers', 'Multiview', 'utils'] diff --git a/Code/Versions.py b/Code/Versions.py new file mode 100644 index 0000000000000000000000000000000000000000..8a83f56382b7e8c347df649837b5cf4ba8a9114c --- /dev/null +++ b/Code/Versions.py @@ -0,0 +1,103 @@ +#!/usr/bin/env python + +""" Script to render versions of modules used """ + +# Import built-in modules + +# Import 3rd party modules + +# Import own modules + + +# Author-Info +__author__ = "Baptiste Bauvin" +__status__ = "Prototype" # Production, Development, Prototype +__date__ = 2016 - 03 - 25 + + +def testVersions(): + isUpToDate = True + toInstall = [] + try: + import sys + # print("Python-V.: " + sys.version) + except: + # print "Please install Python 2.7" + raise + + try: + import pyscm + except: + # print "Please install pyscm" + isUpToDate = False + toInstall.append("pyscm") + + try: + import numpy + # print("Numpy-V.: " + numpy.version.version) + except: + # print "Please install numpy module" + isUpToDate = False + toInstall.append("numpy") + + try: + import scipy + # print("Scipy-V.: " + scipy.__version__) + except: + # print "Please install scipy module" + isUpToDate = False + toInstall.append("scipy") + + try: + import matplotlib + # print("Matplotlib-V.: " + matplotlib.__version__) + except: + # print "Please install matplotlib module" + isUpToDate = False + toInstall.append("matplotlib") + + try: + import sklearn + # print("Sklearn-V.: " + sklearn.__version__) + except: + # print "Please install sklearn module" + isUpToDate = False + toInstall.append("sklearn") + + try: + import logging # To create Log-Files + # print("Logging: " + logging.__version__) + except: + # print "Please install logging module" + isUpToDate = False + toInstall.append("logging") + + try: + import joblib + # print("joblib: " + joblib.__version__) + except: + # print "Pease install joblib module" + isUpToDate = False + toInstall.append("joblib") + + try: + import argparse + # print("argparse: " + argparse.__version__) + except: + # print "Pease install argparse module" + isUpToDate = False + toInstall.append("argparse") + + try: + import h5py # + # print("h5py: " + h5py.__version__) + except: + # print "Pease install h5py module" + isUpToDate = False + toInstall.append("h5py") + + if not isUpToDate: + print "You can't run at the moment, please install the following modules : \n"+ "\n".join(toInstall) + +if __name__== "__main__": + testVersions() \ No newline at end of file