Skip to content

Commit

Permalink
Merge branch 'develop' into feature_small_restart
Browse files Browse the repository at this point in the history
  • Loading branch information
@bigfooted
bigfooted committed Nov 5, 2024
2 parents 2992d7c + c2da451 commit 79bce1f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions meson_options.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ option('extra-deps', type : 'string', value : '', description: 'comma-separated
option('enable-mpp', type : 'boolean', value : false, description: 'enable Mutation++ support')
option('install-mpp', type : 'boolean', value : false, description: 'install Mutation++ in the directory defined with --prefix')
option('enable-coolprop', type : 'boolean', value : false, description: 'enable CoolProp support')
option('enable-mlpcpp', type : 'boolean', value : false, description: 'enable profiling through gprof')
option('enable-gprof', type : 'boolean', value : false, description: 'enable MLPCpp support')
option('enable-mlpcpp', type : 'boolean', value : false, description: 'enable MLPCpp support')
option('enable-gprof', type : 'boolean', value : false, description: 'enable profiling through gprof')
option('opdi-backend', type : 'combo', choices : ['auto', 'macro', 'ompt'], value : 'auto', description: 'OpDiLib backend choice')
option('codi-tape', type : 'combo', choices : ['JacobianLinear', 'JacobianReuse', 'JacobianMultiUse', 'PrimalLinear', 'PrimalReuse', 'PrimalMultiUse'], value : 'JacobianLinear', description: 'CoDiPack tape choice')
option('opdi-shared-read-opt', type : 'boolean', value : true, description : 'OpDiLib shared reading optimization')
Expand Down
2 changes: 1 addition & 1 deletion meson_scripts/init.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def init_submodules(
github_repo_coolprop = "https://github.com/CoolProp/CoolProp"
sha_version_mel = "46205ab019e5224559091375a6d71aabae6bc5b9"
github_repo_mel = "https://github.com/pcarruscag/MEL"
sha_version_mlpcpp = "c19c53ea2b85ccfb185f1c6c87044dc0b5bc7ae0"
sha_version_mlpcpp = "6865a58b22f21a92977839d9c93eae9522402f55"
github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp"

medi_name = "MeDiPack"
Expand Down
2 changes: 1 addition & 1 deletion subprojects/MLPCpp
Submodule MLPCpp updated 12 files
+12 −0 README.md
+ − TestCase/test_MLPCpp
+233 −0 TestCase/test_problem.py
+1 −1 include/CIOMap.hpp
+1 −1 include/CLayer.hpp
+10 −14 include/CLookUp_ANN.hpp
+182 −15 include/CNeuralNetwork.hpp
+2 −1 include/CNeuron.hpp
+36 −1 include/CReadNeuralNetwork.hpp
+11 −0 include/option_maps.hpp
+50 −39 main.cpp
+22 −14 src/Tensorflow_Translation.py

0 comments on commit 79bce1f

Please sign in to comment.