Skip to content

Commit

Permalink
Added pre-trained 2D model.
Browse files Browse the repository at this point in the history
Update README.md
  • Loading branch information
jonathantompson committed Oct 14, 2019
1 parent 8f2f0e2 commit ffb193e
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 1 deletion.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ Note: This is not an official Google product.
UPDATES / NEWS:
---------------

**Oct 14 2019**
- Added a pre-trained 2D model to the repo (for use with the realtime demo). Use
this if you just want to visualize some output running in realtime (skipping
data creation, model training, etc). See realtime demo instructions below.

**Oct 13 2019**
- Verified instructions were still up to date. torch7 does not work with CUDA
SDK newer than 9.2 (so this is what you must use). If you're using CUDA 10.0
Expand Down
1 change: 0 additions & 1 deletion data/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
models
datasets
Binary file added data/models/myModel2D
Binary file not shown.
Binary file added data/models/myModel2D_conf.bin
Binary file not shown.
27 changes: 27 additions & 0 deletions data/models/myModel2D_conf.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
batchSize = 16,
dataDir = "../data/datasets/",
dataset = "output_current_model_sphere",
evaluateDuringTraining = true,
gpu = 1,
ignoreFrames = 0,
loadModel = false,
loadVoxelModel = "none",
lrEpochMults = {
1 = {
epoch = inf,
mult = 0.25,
},
},
maxEpochs = 5000,
maxSamplesPerEpoch = inf,
modelDir = "../data/models/",
modelDirname = "../data/models//myModel2D",
modelFilename = "myModel2D",
numDataThreads = 8,
profile = true,
resumeTraining = false,
statsSimMethod = "",
train = true,
visualizeModel = false,
}
16 changes: 16 additions & 0 deletions data/models/myModel2D_log.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
trLoss trPLoss trULoss trDivLoss trLongTermDivLoss teLoss tePLoss teULoss teDivLoss teLongTermDivLoss
5.6146e-03 0.0000e+00 0.0000e+00 1.2353e-03 4.3794e-03 1.4120e-03 0.0000e+00 0.0000e+00 4.8928e-04 9.2274e-04
1.0715e-03 0.0000e+00 0.0000e+00 4.0139e-04 6.7011e-04 9.4464e-04 0.0000e+00 0.0000e+00 3.5128e-04 5.9336e-04
9.9865e-04 0.0000e+00 0.0000e+00 3.8320e-04 6.1545e-04 8.9851e-04 0.0000e+00 0.0000e+00 3.3100e-04 5.6751e-04
9.6688e-04 0.0000e+00 0.0000e+00 3.5688e-04 6.1000e-04 8.6804e-04 0.0000e+00 0.0000e+00 3.0120e-04 5.6684e-04
9.4064e-04 0.0000e+00 0.0000e+00 3.4365e-04 5.9699e-04 9.5426e-04 0.0000e+00 0.0000e+00 3.4625e-04 6.0801e-04
8.8574e-04 0.0000e+00 0.0000e+00 3.2151e-04 5.6424e-04 1.4471e-03 0.0000e+00 0.0000e+00 9.3058e-04 5.1648e-04
7.0879e-04 0.0000e+00 0.0000e+00 2.4933e-04 4.5945e-04 8.0947e-04 0.0000e+00 0.0000e+00 2.5221e-04 5.5726e-04
6.6269e-04 0.0000e+00 0.0000e+00 2.3170e-04 4.3099e-04 6.4470e-04 0.0000e+00 0.0000e+00 2.3761e-04 4.0709e-04
6.0639e-04 0.0000e+00 0.0000e+00 2.2047e-04 3.8591e-04 6.1713e-04 0.0000e+00 0.0000e+00 2.5089e-04 3.6625e-04
6.4324e-04 0.0000e+00 0.0000e+00 2.3163e-04 4.1162e-04 5.7435e-04 0.0000e+00 0.0000e+00 2.1374e-04 3.6061e-04
7.2473e-04 0.0000e+00 0.0000e+00 2.5871e-04 4.6602e-04 6.9320e-04 0.0000e+00 0.0000e+00 2.8137e-04 4.1183e-04
6.2220e-04 0.0000e+00 0.0000e+00 2.2242e-04 3.9977e-04 5.6376e-04 0.0000e+00 0.0000e+00 1.9474e-04 3.6902e-04
5.5482e-04 0.0000e+00 0.0000e+00 1.9625e-04 3.5857e-04 5.1558e-04 0.0000e+00 0.0000e+00 1.8393e-04 3.3166e-04
6.3985e-04 0.0000e+00 0.0000e+00 2.3903e-04 4.0083e-04 1.1693e-03 0.0000e+00 0.0000e+00 4.5092e-04 7.1836e-04
6.3426e-04 0.0000e+00 0.0000e+00 2.3509e-04 3.9917e-04 5.2112e-04 0.0000e+00 0.0000e+00 1.8330e-04 3.3782e-04
Binary file added data/models/myModel2D_mconf.bin
Binary file not shown.
71 changes: 71 additions & 0 deletions data/models/myModel2D_mconf.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
{
addBatchNorm = false,
addPressureSkip = false,
advectionMethod = "maccormack",
banksAggregateMethod = "concat",
banksJoinStage = 3,
banksNum = 1,
banksSplitStage = 1,
banksType = "mres",
banksWeightShare = false,
batchNormAffine = true,
batchNormEps = 0.0001,
batchNormMom = 0.1,
buoyancyScale = 0,
dt = 0.1,
epoch = 0,
flops = 243793922,
fpropTime = 0.00094755442432745,
gradNormThreshold = 1,
gravityScale = 0,
inputChannels = {
UDiv = false,
div = true,
flags = true,
pDiv = true,
},
is3D = false,
longTermDivLambda = 1,
longTermDivNumSteps = {
1 = 4,
2 = 16,
},
longTermDivProbability = 0.9,
lossDivLambda = 1,
lossFunc = "fluid",
lossFuncBorderWeight = 4,
lossFuncBorderWidth = 3,
lossPLambda = 0,
lossULambda = 0,
modelType = "default",
nonlinType = "relu",
normalizeInput = true,
normalizeInputChan = "UDiv",
normalizeInputFunc = "std",
normalizeInputThreshold = 1e-05,
optimState = {
bestPerf = inf,
beta1 = 0.9,
beta2 = 0.999,
dampening = 0,
epsilon = 0.0001,
learningRate = 0.0025,
learningRateDecay = 0,
momentum = 0.9,
nesterov = false,
weightDecay = 0,
},
optimizationMethod = "adam",
peakMemory = 526608,
poolType = "avg",
simMethod = "convnet",
timeScaleSigma = 1,
trainBuoyancyProb = 0,
trainBuoyancyScale = 2,
trainGravityProb = 0,
trainGravityScale = 2,
trainTargetSource = "manta",
trainVorticityConfinementAmp = 2,
trainVorticityConfinementProb = 0,
vorticityConfinementAmp = 0,
}

0 comments on commit ffb193e

Please sign in to comment.