Skip to content
Snippets Groups Projects
Commit 6b8a17da authored by bbauvin's avatar bbauvin
Browse files

Trying to get imports to work

parent 600e1705
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 10 deletions
......@@ -7,10 +7,11 @@ import os
import logging
import time
import h5py
import imp
from ..utils.Dataset import getShape
from ..utils import HyperParameterSearch
import Multiview
# from . import *
# Author-Info
__author__ = "Baptiste Bauvin"
......@@ -50,10 +51,16 @@ def ExecMultiview(directory, DATASET, name, classificationIndices, KFolds, nbCor
extractionTime = time.time() - t_start
learningIndices, validationIndices = classificationIndices
classifierPackage = getattr(Multiview, CL_type) # Permet d'appeler un module avec une string
classifierModule = getattr(classifierPackage, CL_type)
packageDirectories = [entry for entry in os.listdir("MonoMultiViewClassifiers/Multiview/") if os.path.isdir("MonoMultiViewClassifiers/Multiview/"+entry)]
for packageDirectory in packageDirectories:
if packageDirectory == CL_type:
classifierModule = imp.load_source(CL_type, "MonoMultiViewClassifiers/Multiview/"+packageDirectory+"/"+CL_type+".py")
analysisModule = imp.load_source(CL_type, "MonoMultiViewClassifiers/Multiview/"+packageDirectory+"/analyzeResults.py")
import pdb; pdb.set_trace()
# classifierPackage = getattr(locals(), CL_type) # Permet d'appeler un module avec une string
# classifierModule = getattr(classifierPackage, CL_type)
classifierClass = getattr(classifierModule, CL_type)
analysisModule = getattr(classifierPackage, "analyzeResults")
# analysisModule = getattr(classifierPackage, "analyzeResults")
if hyperParamSearch != "None":
classifier = HyperParameterSearch.searchBestSettings(DATASET, classifierModule, CL_type, metrics, learningIndices, KFolds, randomState,
......
......@@ -2,7 +2,10 @@ import numpy as np
import logging
import pkgutil
# from Methods import *
import pdb;pdb.set_trace()
import Methods
from ... import MonoviewClassifiers
from ...utils.Dataset import getV
......@@ -13,19 +16,19 @@ __status__ = "Prototype" # Production, Development, Prototype
def getBenchmark(benchmark, args=None):
fusionModulesNames = [name for _, name, isPackage
in pkgutil.iter_modules(['Multiview/Fusion/Methods']) if not isPackage]
in pkgutil.iter_modules(['./MonoMultiViewClassifiers/Multiview/Fusion/Methods']) if not isPackage]
fusionModules = [getattr(Methods, fusionModulesName)
for fusionModulesName in fusionModulesNames]
fusionClassifiers = [getattr(fusionModule, fusionModulesName + "Classifier")
for fusionModulesName, fusionModule in zip(fusionModulesNames, fusionModules)]
fusionMethods = dict((fusionModulesName, [name for _, name, isPackage in
pkgutil.iter_modules(
["Multiview/Fusion/Methods/" + fusionModulesName + "Package"])
["./MonoMultiViewClassifiers/Multiview/Fusion/Methods/" + fusionModulesName + "Package"])
if not isPackage])
for fusionModulesName, fusionClasse in zip(fusionModulesNames, fusionClassifiers))
if args is None:
allMonoviewAlgos = [name for _, name, isPackage in
pkgutil.iter_modules(['MonoviewClassifiers'])
pkgutil.iter_modules(['./MonoMultiViewClassifiers/MonoviewClassifiers'])
if (not isPackage)]
fusionMonoviewClassifiers = allMonoviewAlgos
allFusionAlgos = {"Methods": fusionMethods, "Classifiers": fusionMonoviewClassifiers}
......@@ -42,7 +45,7 @@ def getBenchmark(benchmark, args=None):
if args.FU_late_methods == [""]:
benchmark["Multiview"]["Fusion"]["Methods"]["LateFusion"] = [name for _, name, isPackage in
pkgutil.iter_modules([
"Multiview/Fusion/Methods/LateFusionPackage"])
"./MonoMultiViewClassifiers/Multiview/Fusion/Methods/LateFusionPackage"])
if not isPackage]
else:
benchmark["Multiview"]["Fusion"]["Methods"]["LateFusion"] = args.FU_late_methods
......@@ -50,13 +53,13 @@ def getBenchmark(benchmark, args=None):
if args.FU_early_methods == [""]:
benchmark["Multiview"]["Fusion"]["Methods"]["EarlyFusion"] = [name for _, name, isPackage in
pkgutil.iter_modules([
"Multiview/Fusion/Methods/EarlyFusionPackage"])
"./MonoMultiViewClassifiers/Multiview/Fusion/Methods/EarlyFusionPackage"])
if not isPackage]
else:
benchmark["Multiview"]["Fusion"]["Methods"]["EarlyFusion"] = args.FU_early_methods
if args.CL_algos_monoview == ['']:
benchmark["Multiview"]["Fusion"]["Classifiers"] = [name for _, name, isPackage in
pkgutil.iter_modules(['MonoviewClassifiers'])
pkgutil.iter_modules(['./MonoMultiViewClassifiers/MonoviewClassifiers'])
if (not isPackage) and (name != "SGD") and (
name[:3] != "SVM")
and (name != "SCM")]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment