Merge pull request #1251 from ksbeattie/ksb_remove_unused_imports

Remove unused imports
CCSI-Toolset · Nov 13, 2024 · 62534b8 · 62534b8
2 parents aad29e3 + e0ce1c6
commit 62534b8
Show file tree

Hide file tree

Showing 90 changed files with 22 additions and 334 deletions.
diff --git a/.github/actions/pylint/action.yml b/.github/actions/pylint/action.yml
@@ -15,6 +15,6 @@ runs:
       shell: bash
       run: |
         echo '::group::Output of pylint'
-        pylint --rcfile=.pylint/pylintrc --disable=all --enable=E --enable=wrong-import-order foqus_lib/
+        pylint --rcfile=.pylint/pylintrc --disable=all --enable=E --enable=wrong-import-order,unused-import foqus_lib/
         echo '::endgroup::'
 
diff --git a/foqus_lib/foqus.py b/foqus_lib/foqus.py
@@ -28,7 +28,6 @@
 import signal
 import sys
 import time
-import uuid
 import traceback
 import turbine
 

diff --git a/foqus_lib/framework/graph/OptGraphOptim.py b/foqus_lib/framework/graph/OptGraphOptim.py
@@ -12,9 +12,6 @@
 # respectively. This file is also available online at the URL
 # "https://github.com/CCSI-Toolset/FOQUS".
 #################################################################################
-import math
-import time
-
 import numpy
 
 from foqus_lib.framework.graph.edge import *

diff --git a/foqus_lib/framework/graph/graph.py b/foqus_lib/framework/graph/graph.py
@@ -22,11 +22,8 @@
 """
 
 import copy
-import csv
 import logging
 import math
-import multiprocessing.dummy as multiprocessing
-import queue
 import sys
 import threading
 import time

diff --git a/foqus_lib/framework/graph/node.py b/foqus_lib/framework/graph/node.py
@@ -23,7 +23,6 @@
 import logging
 import math
 import os
-from collections import OrderedDict
 from importlib import import_module
 
 import numpy as np
@@ -178,8 +177,6 @@ def attempt_load_smt(try_imports=True):
         # smt should be installed, but not required for non ML/AI models
         import pickle
 
-        import smt
-
         smt_pickle_load = pickle.load
 
     # throw warning if manually failed for test or if package actually not available
@@ -201,8 +198,6 @@ def attempt_load_jenn(try_imports=True):
         # jenn should be installed, but not required for non ML/AI models
         import pickle
 
-        import jenn
-
         jenn_pickle_load = pickle.load
 
     # throw warning if manually failed for test or if package actually not available
@@ -1264,7 +1259,7 @@ def setSim(self, newType=None, newModel=None, force=False, ids=None):
                     )
         elif self.isModelML:
             # assume a custom layer exists unless the model form indicates otherwise
-            # for Keras models when expected attriutes don't exist
+            # for Keras models when expected attributes don't exist
             self.keras_has_custom_layer = True
             # link to pymodel class for ml/ai models
             cwd = os.getcwd()

diff --git a/foqus_lib/framework/graph/nodeVars.py b/foqus_lib/framework/graph/nodeVars.py
@@ -21,12 +21,10 @@
 """
 
 import copy
-import json
 import logging
 import math
 from collections import OrderedDict
 
-import numpy as np
 
 from foqus_lib.framework.foqusException.foqusException import *
 from foqus_lib.framework.uq.Distribution import Distribution

diff --git a/foqus_lib/framework/listen/listen.py b/foqus_lib/framework/listen/listen.py
@@ -26,11 +26,8 @@
 import copy
 import logging
 import threading
-import time
 from multiprocessing.connection import Listener
 
-import numpy as np
-
 
 class foqusListener2(threading.Thread):
     """

diff --git a/foqus_lib/framework/ml_ai_models/mlaiSearch.py b/foqus_lib/framework/ml_ai_models/mlaiSearch.py
@@ -20,7 +20,6 @@
 John Eslick, Carnegie Mellon University, 2014
 """
 
-import importlib
 import logging
 import os
 import sys

diff --git a/foqus_lib/framework/optimizer/BFGS.py b/foqus_lib/framework/optimizer/BFGS.py
@@ -23,16 +23,9 @@
 
 John Eslick, Carnegie Mellon University, 2014
 """
-import copy
-import csv
 import logging
 import math
-import os
-import pickle
-import queue
-import sys
 import time
-import traceback
 
 import numpy
 

diff --git a/foqus_lib/framework/optimizer/NLopt.py b/foqus_lib/framework/optimizer/NLopt.py
@@ -25,16 +25,9 @@
 
 John Eslick, Carnegie Mellon University, 2014
 """
-import copy  # too lazy to sort out which I really need in here
-import csv
 import logging
 import math
-import os
-import pickle
-import queue
-import sys
 import time  # Some of these things are left over from CMA-ES
-import traceback
 
 import numpy
 

diff --git a/foqus_lib/framework/optimizer/OptCMA.py b/foqus_lib/framework/optimizer/OptCMA.py
@@ -32,14 +32,9 @@
 John Eslick, Carnegie Mellon University, 2014
 """
 
-import copy
-import csv
 import logging
 import math
-import os
 import pickle
-import queue
-import sys
 import time
 import traceback
 

diff --git a/foqus_lib/framework/optimizer/PSUADE.py b/foqus_lib/framework/optimizer/PSUADE.py
@@ -19,21 +19,13 @@
 text).  They also need to have a .py extension and inherit the optimization class.
 
 """
-import copy
-import csv
 import logging
-import math
-import os
-import queue
-import sys
 
 #
 # PSUADE
 #
 import time
-import traceback
 
-import numpy
 
 from foqus_lib.framework.optimizer.optimization import optimization
 

diff --git a/foqus_lib/framework/optimizer/SLSQP.py b/foqus_lib/framework/optimizer/SLSQP.py
@@ -24,16 +24,9 @@
 John Eslick, Carnegie Mellon University, 2014
 """
 
-import copy
-import csv
 import logging
 import math
-import os
-import pickle
-import queue
-import sys
 import time
-import traceback
 
 import numpy
 

diff --git a/foqus_lib/framework/optimizer/SM_Optimizer.py b/foqus_lib/framework/optimizer/SM_Optimizer.py
@@ -23,34 +23,22 @@
 Anuja Deshpande, KeyLogic Systems, Inc. - NETL
 """
 
-import copy
-import csv
 import importlib
 import logging
 import math
 import os
-import pickle
-import queue
 import re
-import shutil
 import subprocess
-import sys
-import threading
 import time
-import traceback
 
 import numpy as np
 
 try:
-    import win32api  # used to get short file name for alamo sim exe
     import win32process
 except:
     pass
 
-from foqus_lib.framework.graph.edge import edge, edgeConnect
-from foqus_lib.framework.graph.nodeVars import NodeVars
 from foqus_lib.framework.optimizer.optimization import optimization
-from foqus_lib.framework.surrogate.surrogate import surrogate
 from foqus_lib.framework.uq.SurrogateParser import SurrogateParser
 
 # Check that the required pyomo, pyDOE, and smt packages are available for the surrogate based optimization plugin and import it.
@@ -61,22 +49,15 @@
     # to make pylint happy without affecting the existing runtime behavior
     import pyutilib.subprocess.GlobalData
     from pyomo.environ import (
-        ConcreteModel,
-        Constraint,
         ConstraintList,
         Objective,
-        PositiveReals,
         Var,
-        exp,
-        log,
         value,
     )
     from pyomo.opt import SolverFactory
 
     pyutilib.subprocess.GlobalData.DEFINE_SIGNAL_HANDLERS_DEFAULT = False
     from pyDOE import *
-    from pyomo.core.expr import current as EXPR
-    from pyomo.core.expr.current import clone_expression
     from smt.sampling_methods import LHS
 
     packages_available = True

diff --git a/foqus_lib/framework/optimizer/Sample.py b/foqus_lib/framework/optimizer/Sample.py
@@ -24,15 +24,7 @@
 John Eslick, Carnegie Mellon University, 2014
 """
 
-import copy
-import csv
-import logging
-import math
-import os
-import queue
-import sys
 import time
-import traceback
 
 import numpy
 

diff --git a/foqus_lib/framework/optimizer/Snobfit.py b/foqus_lib/framework/optimizer/Snobfit.py
@@ -23,27 +23,17 @@
 Anuja Deshpande, KeyLogic Systems, Inc. - NETL
 """
 
-import copy
-import csv
 import logging
 import math
-import os
-import pickle
-import queue
-import sys
 import time
-import traceback
 
 import numpy
 
-from foqus_lib.framework.graph.nodeVars import NodeVars
-from foqus_lib.framework.graph.OptGraphOptim import optim, optimObj
 from foqus_lib.framework.optimizer.optimization import optimization
 
 # Check that the Snobfit module is available and import it if possible.
 # If not the Snobfit plug-in will not be available.
 try:
-    import SQCommon
     import SQSnobFit
 
     snobfit_available = True

diff --git a/foqus_lib/framework/optimizer/optimization.py b/foqus_lib/framework/optimizer/optimization.py
@@ -19,14 +19,9 @@
 John Eslick, Carnegie Mellon University, 2014
 """
 
-import copy
-import importlib
 import logging
-import os
 import queue
-import sys
 import threading
-import traceback
 
 from foqus_lib.framework.foqusOptions.optionList import optionList
 

diff --git a/foqus_lib/framework/optimizer/problem.py b/foqus_lib/framework/optimizer/problem.py
@@ -23,13 +23,11 @@
 import csv
 import json
 import logging
-import math
 import operator
 import time
 from functools import reduce
 
 from foqus_lib.framework.at_dict.at_dict import AtDict
-from foqus_lib.framework.foqusOptions.optionList import optionList
 
 
 class objectiveFunction(object):

diff --git a/foqus_lib/framework/ouu/OUU.py b/foqus_lib/framework/ouu/OUU.py
@@ -15,16 +15,14 @@
 import os
 import platform
 import re
-import subprocess
 import tempfile
 
 import numpy as np
-from PyQt5 import QtCore, QtGui
+from PyQt5 import QtCore
 
 from foqus_lib.framework.uq.Common import Common
 from foqus_lib.framework.uq.Distribution import Distribution
 from foqus_lib.framework.uq.LocalExecutionModule import LocalExecutionModule
-from foqus_lib.framework.uq.Model import Model
 from foqus_lib.framework.uq.RSAnalyzer import RSAnalyzer
 from foqus_lib.framework.uq.SampleData import SampleData
 from foqus_lib.framework.uq.SamplingMethods import SamplingMethods

diff --git a/foqus_lib/framework/pymodel/heat_integration.py b/foqus_lib/framework/pymodel/heat_integration.py
@@ -15,7 +15,6 @@
 #
 # FOQUS_PYMODEL_PLUGIN
 
-import logging
 import subprocess
 
 import numpy

diff --git a/foqus_lib/framework/pymodel/pymodel.py b/foqus_lib/framework/pymodel/pymodel.py
@@ -14,8 +14,6 @@
 #################################################################################
 from collections import OrderedDict
 
-import numpy
-
 from foqus_lib.framework.graph.nodeVars import *
 
 

diff --git a/foqus_lib/framework/pymodel/pymodel_test.py b/foqus_lib/framework/pymodel/pymodel_test.py
@@ -15,8 +15,6 @@
 #
 # FOQUS_PYMODEL_PLUGIN
 
-import numpy
-
 from foqus_lib.framework.graph.nodeVars import *
 from foqus_lib.framework.pymodel.pymodel import *
 

diff --git a/foqus_lib/framework/sampleResults/results.py b/foqus_lib/framework/sampleResults/results.py
@@ -23,7 +23,6 @@
 import json
 import logging
 import re
-import time
 from collections import OrderedDict
 from io import StringIO
 

diff --git a/foqus_lib/framework/sampleResults/test/results_s3_test.py b/foqus_lib/framework/sampleResults/test/results_s3_test.py
@@ -22,7 +22,6 @@
 """
 import json
 import logging
-import time
 
 from ...graph.graph import Graph
 from .. import results

diff --git a/foqus_lib/framework/sdoe/nusf_dask.py b/foqus_lib/framework/sdoe/nusf_dask.py
@@ -18,9 +18,8 @@
 import dask.bag as db
 import numpy as np
 import pandas as pd  # only used for the final output of criterion
-from scipy.stats import rankdata
 
-from .distance import compute_dist, compute_min_params
+from .distance import compute_min_params
 from .nusf import compute_dmat, scale_xs, scale_y, update_min_dist