more reverting

Author: mrodrig6

toolchain/mfc/build.py

@@ -180,40 +180,18 @@ def install(self, case: input.MFCInputFile):
 
         cons.print(no_indent=True)
 
-def safe_deps(*args):
-    "Flatten, remove None, and return unique dependencies."
-    deps = []
-    for item in args:
-        if item is None:
-            continue
-        if isinstance(item, list):
-            deps.extend(i for i in item if i is not None)
-        else:
-            deps.append(item)
-    return deps
-
-# Default to "ON", but allow override via environment variable
-fftw_env = os.environ.get("MFC_FFTW", "ON").strip().upper()
-fftw_flag = "OFF" if fftw_env == "OFF" else "ON"
-fftw_enabled = fftw_env != "OFF"
-TARGETS = set()
 #                         name             flags                       isDep  isDef  isReq  dependencies                        run order
-if fftw_enabled:
-    FFTW       = MFCTarget('fftw',       [f"-DMFC_FFTW={fftw_flag}"],   True,  False, False, MFCTarget.Dependencies([], [], []), -1)
-    TARGETS.add( FFTW )
-else:
-    FFTW = None
-
+FFTW          = MFCTarget('fftw',          ['-DMFC_FFTW=ON'],          True,  False, False, MFCTarget.Dependencies([], [], []), -1)
 HDF5          = MFCTarget('hdf5',          ['-DMFC_HDF5=ON'],          True,  False, False, MFCTarget.Dependencies([], [], []), -1)
 SILO          = MFCTarget('silo',          ['-DMFC_SILO=ON'],          True,  False, False, MFCTarget.Dependencies([HDF5], [], []), -1)
 HIPFORT       = MFCTarget('hipfort',       ['-DMFC_HIPFORT=ON'],       True,  False, False, MFCTarget.Dependencies([], [], []), -1)
 PRE_PROCESS   = MFCTarget('pre_process',   ['-DMFC_PRE_PROCESS=ON'],   False, True,  False, MFCTarget.Dependencies([], [], []), 0)
-SIMULATION    = MFCTarget('simulation',    ['-DMFC_SIMULATION=ON'],    False, True,  False, MFCTarget.Dependencies([], safe_deps(FFTW), [HIPFORT]), 1)
-POST_PROCESS  = MFCTarget('post_process',  ['-DMFC_POST_PROCESS=ON'],  False, True,  False, MFCTarget.Dependencies(safe_deps(FFTW, HDF5, SILO), [], []), 2)
+SIMULATION    = MFCTarget('simulation',    ['-DMFC_SIMULATION=ON'],    False, True,  False, MFCTarget.Dependencies([], [FFTW], [HIPFORT]), 1)
+POST_PROCESS  = MFCTarget('post_process',  ['-DMFC_POST_PROCESS=ON'],  False, True,  False, MFCTarget.Dependencies([FFTW, HDF5, SILO], [], []), 2)
 SYSCHECK      = MFCTarget('syscheck',      ['-DMFC_SYSCHECK=ON'],      False, False, True,  MFCTarget.Dependencies([], [], [HIPFORT]), -1)
 DOCUMENTATION = MFCTarget('documentation', ['-DMFC_DOCUMENTATION=ON'], False, False, False, MFCTarget.Dependencies([], [], []), -1)
 
-TARGETS.update( {HDF5, SILO, HIPFORT, PRE_PROCESS, SIMULATION, POST_PROCESS, SYSCHECK, DOCUMENTATION} )
+TARGETS = { FFTW, HDF5, SILO, HIPFORT, PRE_PROCESS, SIMULATION, POST_PROCESS, SYSCHECK, DOCUMENTATION }
 
 DEFAULT_TARGETS    = { target for target in TARGETS if target.isDefault }
 REQUIRED_TARGETS   = { target for target in TARGETS if target.isRequired }