From 53c13bf53d1f696dbf1ccd562ede4b8e06981757 Mon Sep 17 00:00:00 2001 From: Rene Date: Thu, 8 Aug 2024 15:49:15 +0200 Subject: [PATCH] Minor Code Cleanup --- src/BasisConvolution/util/arguments.py | 2 +- src/BasisConvolution/util/augment.py | 2 +- src/BasisConvolution/util/datautils.py | 2 +- src/BasisConvolution/util/hyperparameters.py | 11 ++++------- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/BasisConvolution/util/arguments.py b/src/BasisConvolution/util/arguments.py index efab87f..2b3e82f 100644 --- a/src/BasisConvolution/util/arguments.py +++ b/src/BasisConvolution/util/arguments.py @@ -6,7 +6,7 @@ parser.add_argument('-w','--windowFunction', type=str, default=argparse.SUPPRESS, help='Window function [default = poly6]') parser.add_argument('-c','--cutoff', type=int, default=argparse.SUPPRESS, help='Cutoff distance [default = 1800]') parser.add_argument('-b','--batch_size', type=int, default=argparse.SUPPRESS, help='Batch size [default = 1]') -parser.add_argument('-o','--output', type = str, default = '../../trainingData_TGV/randomFlows/', help='Output directory [default = ""]') +parser.add_argument('-o','--output', type = str, default = argparse.SUPPRESS, help='Output directory [default = ""]') parser.add_argument('--cutlassBatchSize', type=int, default=argparse.SUPPRESS, help='Cutlass batch size [default = 512]') parser.add_argument('--lr', type=float, default=argparse.SUPPRESS, help='Learning rate [default = 0.01]') parser.add_argument('--finalLR', type=float, default=argparse.SUPPRESS, help='Final learning rate [default = 0.0001]') diff --git a/src/BasisConvolution/util/augment.py b/src/BasisConvolution/util/augment.py index 0e92d8d..058bd10 100644 --- a/src/BasisConvolution/util/augment.py +++ b/src/BasisConvolution/util/augment.py @@ -107,7 +107,7 @@ def loadAugmentedFrame(index, dataset, hyperParameterDict, unrollLength = 8): # print('gt') cState = currentState for state in trajectoryStates: - state['fluid']['target'] = getFeatures(hyperParameterDict['groundTruth'].split(' '), state, cState, 'fluid', config, state['time'] - cState['time'], verbose = False, includeOther = 'boundary' in currentState and currentState['boundary'] is not None,) + state['fluid']['target'] = getFeatures(hyperParameterDict['groundTruth'].split(' '), state, cState, 'fluid', config, state['time'] - cState['time'] if state['time'] != cState['time'] else 1, verbose = False, includeOther = 'boundary' in currentState and currentState['boundary'] is not None,) cState = state return config, attributes, augmentedStates[0], augmentedStates[1] if priorState is not None else None, augmentedStates[2:] if priorState is not None else augmentedStates[1:] diff --git a/src/BasisConvolution/util/datautils.py b/src/BasisConvolution/util/datautils.py index 391bf33..c7671f4 100644 --- a/src/BasisConvolution/util/datautils.py +++ b/src/BasisConvolution/util/datautils.py @@ -282,7 +282,7 @@ def getStyle(inFile): def parseFile(inFile, hyperParameterDict): frameDistance = hyperParameterDict['frameDistance'] if 'frameDistance' in hyperParameterDict else 1 frameSpacing = hyperParameterDict['dataDistance'] if 'dataDistance' in hyperParameterDict else 1 - maxRollout = hyperParameterDict['maxRollOut'] if 'maxRollOut' in hyperParameterDict else 0 + maxRollout = hyperParameterDict['maxUnroll'] if 'maxUnroll' in hyperParameterDict else 0 temporalData = isTemporalData(inFile) skip = (1 if hyperParameterDict['zeroOffset'] and temporalData else 0) if 'zeroOffset' in hyperParameterDict else 0 diff --git a/src/BasisConvolution/util/hyperparameters.py b/src/BasisConvolution/util/hyperparameters.py index bc8767c..5fa7417 100644 --- a/src/BasisConvolution/util/hyperparameters.py +++ b/src/BasisConvolution/util/hyperparameters.py @@ -15,7 +15,6 @@ def defaultHyperParameters(): 'initialLR': 0.01, 'finalLR': 0.0001, 'lrStep': 10, - 'maxRollOut': 10, 'epochs': 25, 'frameDistance': 4, 'iterations': 1000, @@ -36,7 +35,7 @@ def defaultHyperParameters(): 'weight_decay': 0, 'input': '', 'input': './', - 'output': '../../trainingData_TGV/randomFlows/', + 'output': 'training', 'outputBias': False, 'loss': 'mse', 'batchSize': 1, @@ -82,7 +81,6 @@ def parseArguments(args, hyperParameterDict): hyperParameterDict['lrStep'] = args.lrStep if hasattr(args, 'lrStep') else hyperParameterDict['lrStep'] - hyperParameterDict['maxRollOut'] = args.maxUnroll if hasattr(args, 'maxUnroll') else hyperParameterDict['maxUnroll'] hyperParameterDict['epochs'] = args.epochs if hasattr(args, 'epochs') else hyperParameterDict['epochs'] hyperParameterDict['frameDistance'] = args.frameDistance if hasattr(args, 'frameDistance') else hyperParameterDict['frameDistance'] hyperParameterDict['iterations'] = args.iterations if hasattr(args, 'iterations') else hyperParameterDict['iterations'] @@ -376,7 +374,7 @@ def toPandaDict(hyperParameterDict): 'layers': hyperParameterDict['layers'], 'seed': hyperParameterDict['seed'], - 'windowFunction': hyperParameterDict['windowFunction'], + 'windowFunction': hyperParameterDict['windowFunction'] if hyperParameterDict['windowFunction'] is not None else 'None', 'coordinateMapping' : hyperParameterDict['coordinateMapping'], 'trainingFiles': hyperParameterDict['trainingFiles'], @@ -415,7 +413,6 @@ def toPandaDict(hyperParameterDict): 'minUnroll': hyperParameterDict['minUnroll'], 'maxUnroll': hyperParameterDict['maxUnroll'], - 'maxRollOut': hyperParameterDict['maxRollOut'], 'cutlassBatchSize': hyperParameterDict['cutlassBatchSize'], 'li' : hyperParameterDict['liLoss'] if 'liLoss' in hyperParameterDict else None, @@ -588,9 +585,9 @@ def finalizeHyperParameters(hyperParameterDict, dataset): hyperParameterDict['layers'] = [int(s) for s in hyperParameterDict['widths']] - hyperParameterDict['shortLabel'] = f'{hyperParameterDict["networkType"]:8s} [{hyperParameterDict["arch"]:14s}] -> [{hyperParameterDict["basisFunctions"]:8s}] x [{hyperParameterDict["basisTerms"]:2d}] @ {hyperParameterDict["coordinateMapping"]:4s}/{hyperParameterDict["windowFunction"]:4s}, {hyperParameterDict["fluidFeatures"]} -> {hyperParameterDict["groundTruth"]}' + hyperParameterDict['shortLabel'] = f'{hyperParameterDict["networkType"]:8s} [{hyperParameterDict["arch"]:14s}] -> [{hyperParameterDict["basisFunctions"]:8s}] x [{hyperParameterDict["basisTerms"]:2d}] @ {hyperParameterDict["coordinateMapping"]:4s}/{hyperParameterDict["windowFunction"] if hyperParameterDict["windowFunction"] is not None else "None":4s}, {hyperParameterDict["fluidFeatures"]} -> {hyperParameterDict["groundTruth"]}' - hyperParameterDict['progressLabel'] = f'{hyperParameterDict["networkType"]:8s} [{hyperParameterDict["arch"]:4s}] -> [{hyperParameterDict["basisFunctions"]:8s}] x [{hyperParameterDict["basisTerms"]:2d}] @ {hyperParameterDict["coordinateMapping"]:4s}/{hyperParameterDict["windowFunction"]:4s}' + hyperParameterDict['progressLabel'] = f'{hyperParameterDict["networkType"]:8s} [{hyperParameterDict["arch"]:4s}] -> [{hyperParameterDict["basisFunctions"]:8s}] x [{hyperParameterDict["basisTerms"]:2d}] @ {hyperParameterDict["coordinateMapping"]:4s}/{hyperParameterDict["windowFunction"] if hyperParameterDict["windowFunction"] is not None else "None":4s}' hyperParameterDict['exportLabel'] = f'{hyperParameterDict["timestamp"]} - {hyperParameterDict["networkSeed"]} - {hyperParameterDict["shortLabel"]}'.replace(":", ".").replace("/", "_")