Fix imp import

python/mor/reduction/container/reductionParam.py

@@ -101,5 +101,4 @@ def setFilesName(self):
         nodeName = path.split(slash)[-1]
         self.gieFilesNames.append('HyperReducedFEMForceField_'+nodeName+'_Gie.txt')
         self.RIDFilesNames.append('RID_'+nodeName+'.txt')
-        self.weightsFilesNames.append('weight_'+nodeName+'.txt')
-        self.savedElementsFilesNames.append('elmts_'+nodeName+'.txt')
+        self.weightsFilesNames.append('weight_'+nodeName+'.txt')

python/mor/reduction/reduceModel.py

@@ -379,17 +379,6 @@ def phase3(self,phasesToExecute=None,nbrOfModes=None):
                 print("        scene: "+res["scene"])
                 print("     duration: "+str(res["duration"])+" sec")
 
-        files = glob.glob(results[self.phaseToSaveIndex]["directory"]+slash+"*_elmts.txt")
-        if files:
-            for i,file in enumerate(files):
-                file = os.path.normpath(file)
-                files[i] = file.split(slash)[-1]
-            # print("FILES ----------->",files)
-            self.reductionParam.savedElementsFilesNames = files
-
-        for fileName in self.reductionParam.savedElementsFilesNames :
-            u.copyFileIntoAnother(results[self.phaseToSaveIndex]["directory"]+slash+fileName,self.packageBuilder.debugDir+fileName)
-
         files = glob.glob(results[self.phaseToSaveIndex]["directory"]+slash+"*_Gie.txt")
         if files: 
             for i,file in enumerate(files):
@@ -442,32 +431,15 @@ def phase4(self,nbrOfModes=None):
             raise ValueError("nbrOfModes incorrect\n"\
                 +"  nbrOfModes given :"+str(nbrOfModes)+" | nbrOfModes max possible : "+str(nbrOfModesPossible))
 
-        # print(files)
-        files = glob.glob(self.packageBuilder.debugDir+"*_elmts.txt")
-        if files:
-            for i,file in enumerate(files):
-                file = os.path.normpath(file)
-                files[i] = file.split(slash)[-1]
-            # print("FILES ----------->",files)
-            self.reductionParam.savedElementsFilesNames = files
 
         files = glob.glob(self.packageBuilder.debugDir+"*_Gie.txt")
         if files: 
             for i,file in enumerate(files):
                 file = os.path.normpath(file)
                 files[i] = file.split(slash)[-1]
-            # print("FILES ----------->",files)
             self.reductionParam.gieFilesNames = files
 
 
-        for i , gie in enumerate(self.reductionParam.gieFilesNames):
-            tmp = gie.replace('_Gie.txt','')
-            for j , elmts in enumerate(self.reductionParam.savedElementsFilesNames):
-                if tmp in elmts:
-                    tmp = self.reductionParam.savedElementsFilesNames[j]
-                    self.reductionParam.savedElementsFilesNames[j] = self.reductionParam.savedElementsFilesNames[i]
-                    self.reductionParam.savedElementsFilesNames[i] = tmp
-
         self.reductionParam.RIDFilesNames = []
         self.reductionParam.weightsFilesNames = []
         for fileName in self.reductionParam.gieFilesNames :

python/mor/reduction/script/ReadGieFileAndComputeRIDandWeights.py

@@ -87,7 +87,7 @@ def selectECSW(G,b,tau,verbose):
     if verbose :
         print ("Final Error: ", errDif(G,xi,b) ," Target Error: ", valTarget)
     else :
-        u.update_progress( 1 )
+        util.update_progress( 1 )
 
     return (ECSWindex,xi)
 

python/mor/reduction/template/debug_scene.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 import os
-import imp
 import platform
 from sys import argv
 
@@ -12,7 +11,8 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation
+from mor.utility import utility as u 
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -21,7 +21,7 @@
 # Our Original Scene IMPORT
 originalScene = r'$ORIGINALSCENE'
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
 paramWrapper = $PARAMWRAPPER
 
@@ -36,4 +36,4 @@ def createScene(rootNode):
     path , param = paramWrapper
     pathToNode = path[1:]
 
-    u.createDebug(rootNode,pathToNode,stateFileName)
+    sceneCreation.createDebug(rootNode,pathToNode,stateFileName)

python/mor/reduction/template/phase1_snapshots.py

@@ -16,7 +16,7 @@
 
 # MOR IMPORT
 from mor.reduction.container import ObjToAnimate
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -84,7 +84,7 @@ def createScene(rootNode):
     # Now that we have the AnimationManager & a list of the nodes we want to animate
     # we can add an animation to then according to the arguments in listObjToAnimate
 
-    u.addAnimation(rootNode,phase,timeExe,dt,listObjToAnimate)
+    sceneCreation.addAnimation(rootNode,phase,timeExe,dt,listObjToAnimate)
 
     # Now that all the animations are defined we need to record their results
     # for that we take the parent node normally given as an argument in paramWrapper

python/mor/reduction/template/phase2_prepareECSW.py

@@ -13,7 +13,7 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation
 from mor.wrapper import replaceAndSave
 
 # Our Phase1 Scene IMPORT
@@ -50,7 +50,7 @@ def createScene(rootNode):
     # Modify the scene to perform hyper-reduction according
     # to the informations collected by the wrapper
 
-    u.modifyGraphScene(rootNode,nbrOfModes,paramWrapper)
+    sceneCreation.modifyGraphScene(rootNode,nbrOfModes,paramWrapper)
 
 
     # We Update the link 

python/mor/reduction/template/phase3_performECSW.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
 import sys
-import imp
 import platform
 
 #   STLIB IMPORT
@@ -12,7 +11,8 @@
                      +"Please install it : https://github.com/SofaDefrost/STLIB")
 
 # MOR IMPORT
-from mor.utility import sceneCreation as u
+from mor.utility import sceneCreation
+from mor.utility import utility as u 
 from mor.utility import writeScene
 from mor.wrapper import replaceAndSave
 
@@ -23,7 +23,7 @@
 # Our Original Scene IMPORT
 originalScene = r'$ORIGINALSCENE'
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
 # Scene parameters
 nbrOfModes = $NBROFMODES
@@ -52,16 +52,16 @@ def createScene(rootNode):
     originalScene.createScene(Wrapper(rootNode, replaceAndSave.MORreplace, paramWrapper))  # 1
 
     # Add MOR plugin if not found
-    u.addPlugin(rootNode,"ModelOrderReduction")
+    sceneCreation.addPlugin(rootNode,"ModelOrderReduction")
     pluginName = []
-    plugins = u.searchObjectClassInGraphScene(rootNode,"RequiredPlugin")
+    plugins = sceneCreation.searchObjectClassInGraphScene(rootNode,"RequiredPlugin")
     for plugin in plugins:
         pluginName.append(plugin.pluginName)
 
     # Modify the scene to perform hyper-reduction according
     # to the informations collected by the wrapper
 
-    u.modifyGraphScene(rootNode,nbrOfModes,paramWrapper)
+    sceneCreation.modifyGraphScene(rootNode,nbrOfModes,paramWrapper)
 
     # We collect all the informations during 1 & 2 to be able to create with
     # writeGraphScene a SOFA scene containing only our reduced model that we can instanciate

python/mor/utility/template/importScene.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 import os
-import imp
 import platform
 
 # MOR IMPORT
-from mor.utility import graphScene as u
+from mor.utility import graphScene 
+from mor.utility import utility as u 
 
 slash = '/'
 if "Windows" in platform.platform():
@@ -13,12 +13,11 @@
 # Our Original Scene IMPORT
 originalScene = r'$ORIGINALSCENE'
 originalScene = os.path.normpath(originalScene)
-originalScene = imp.load_source(originalScene.split(slash)[-1], originalScene)
+originalScene = u.load_source(originalScene.split(slash)[-1], originalScene)
 
-###############################################################################
 
 def createScene(rootNode):
     # Import Original scene
     originalScene.createScene(rootNode)
 
-    u.dumpGraphScene(rootNode)
+    graphScene.dumpGraphScene(rootNode)

python/mor/utility/utility.py

@@ -32,6 +32,24 @@
 import time
 
 
+import importlib.util
+import importlib.machinery
+
+def load_source(modname, filename):
+    '''
+    Fix of module import due to python update
+    from using imp to importlib
+    Not same API, waiting for update, using this fix meanwhile
+    '''
+    loader = importlib.machinery.SourceFileLoader(modname, filename)
+    spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
+    module = importlib.util.module_from_spec(spec)
+    # The module is always executed and not cached in sys.modules.
+    # Uncomment the following line to cache the module.
+    # sys.modules[module.__name__] = module
+    loader.exec_module(module)
+    return module
+
 def update_progress(progress):
     barLength = 50 # Modify this to change the length of the progress bar
     status = "Compute Weight&RID"