adding MITLicensing

OPM · Aug 27, 2024 · 6e135b9 · 6e135b9
1 parent 7ffe97c
commit 6e135b9
Show file tree

Hide file tree

Showing 37 changed files with 139 additions and 199 deletions.
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -475,7 +475,7 @@ list (APPEND TEST_SOURCE_FILES
       tests/material/test_spline.cpp
       tests/material/test_tabulation.cpp
       tests/test_Visitor.cpp
-      opm/ml/keras_model_test.cpp
+      tests/ml/keras_model_test.cpp
 )
 
 # tests that need to be linked to dune-common
@@ -648,6 +648,15 @@ list (APPEND TEST_DATA_FILES
       tests/material/co2_unittest_below_sat.json
       tests/material/h2o_unittest.json
       tests/material/h2_unittest.json
+      tests/ml/ml_tools/models/test_dense_1x1.model
+      tests/ml/ml_tools/models/test_dense_2x2.model
+      tests/ml/ml_tools/models/test_dense_10x1.model
+      tests/ml/ml_tools/models/test_dense_10x10.model
+      tests/ml/ml_tools/models/test_dense_10x10x10.model
+      tests/ml/ml_tools/models/test_dense_relu_10.model
+      tests/ml/ml_tools/models/test_dense_tanh_10.model
+      tests/ml/ml_tools/models/test_relu_10.model
+      tests/ml/ml_tools/models/test_scalingdense_10x1.model
 )
 if(ENABLE_ECL_OUTPUT)
   list (APPEND TEST_DATA_FILES

diff --git a/opm/ml/LICENSE.MIT b/opm/ml/LICENSE.MIT
@@ -0,0 +1,19 @@
+Copyright (c) 2016 Robert W. Rose, 2018 Paul Maevskikh, 2024 NORCE
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/opm/ml/keras_model.cpp b/opm/ml/keras_model.cpp
@@ -3,12 +3,11 @@
  * Copyright (c) 2016 Robert W. Rose
  * Copyright (c) 2018 Paul Maevskikh
  *
- * MIT License, see LICENSE.OLD file.
+ * MIT License, see LICENSE.MIT file.
  */ 
 
 /*
- * Copyright (c) 2024 Birane Kane
- * Copyright (c) 2024 Tor Harald Sandve
+  Copyright (c) 2024 NORCE
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -37,8 +36,6 @@
 
 namespace Opm {
 
-#pragma once
-
 
 bool ReadUnsignedInt(std::ifstream* file, unsigned int* i) {
     KASSERT(file, "Invalid file stream");
@@ -173,8 +170,6 @@ bool KerasLayerScaling<Evaluation>::LoadLayer(std::ifstream* file) {
     KASSERT(ReadFloat(file, &data_max), "Failed to read max");
     KASSERT(ReadFloat(file, &feat_inf), "Failed to read max");
     KASSERT(ReadFloat(file, &feat_sup), "Failed to read max");
-
-    // KASSERT(ReadFloat(file, &feat), "Failed to read max");
     return true;
 }
 
@@ -188,8 +183,6 @@ bool KerasLayerScaling<Evaluation>::Apply(Tensor<Evaluation>* in, Tensor<Evaluat
     *out = *in;
 
     for (size_t i = 0; i < out->data_.size(); i++) {
-        // std::cout<<"out->data_[i]"<<std::endl;
-        // std::cout<<out->data_[i]<<std::endl;
         auto tempscale = (out->data_[i] - data_min)/(data_max - data_min);
         out->data_[i] = tempscale * (feat_sup - feat_inf) + feat_inf;
     }
@@ -214,13 +207,9 @@ bool KerasLayerUnScaling<Evaluation>::Apply(Tensor<Evaluation>* in, Tensor<Evalu
     KASSERT(in, "Invalid input");
     KASSERT(out, "Invalid output");
 
-
     *out = *in;
-    // out->Flatten();
 
     for (size_t i = 0; i < out->data_.size(); i++) {
-        // std::cout<<"out->data_[i]"<<std::endl;
-        // std::cout<<out->data_[i]<<std::endl;
         auto tempscale = (out->data_[i] - feat_inf)/(feat_sup - feat_inf);
 
         out->data_[i] = tempscale * (data_max - data_min) + data_min;
@@ -267,13 +256,6 @@ bool KerasLayerDense<Evaluation>::Apply(Tensor<Evaluation>* in, Tensor<Evaluatio
     KASSERT(out, "Invalid output");
     KASSERT(in->dims_.size() <= 2, "Invalid input dimensions");
 
-
-    // if (in->dims_.size() == 1) {
-    //     KASSERT(in->dims_[0] == weights_.dims_[0], "Dimension mismatch %d %d",
-    //             in->dims_[0], weights_.dims_[0]);
-    // }
-
-
     if (in->dims_.size() == 2) {
         KASSERT(in->dims_[1] == weights_.dims_[0], "Dimension mismatch %d %d",
                 in->dims_[1], weights_.dims_[0]);

diff --git a/opm/ml/keras_model.hpp b/opm/ml/keras_model.hpp
@@ -3,12 +3,11 @@
  * Copyright (c) 2016 Robert W. Rose
  * Copyright (c) 2018 Paul Maevskikh
  *
- * MIT License, see LICENSE.OLD file.
+ * MIT License, see LICENSE.MIT file.
  */ 
 
 /*
- * Copyright (c) 2024 Birane Kane
- * Copyright (c) 2024 Tor Harald Sandve
+  Copyright (c) 2024 NORCE
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify

diff --git a/opm/ml/ml_tools/__init__.py b/opm/ml/ml_tools/__init__.py
diff --git a/opm/ml/ml_tools/kerasify.py b/opm/ml/ml_tools/kerasify.py
@@ -1,6 +1,12 @@
-#  Copyright (c) 2024 Birane Kane
-#  Copyright (c) 2024 Tor Harald Sandve
+# /*
 
+#  * Copyright (c) 2016 Robert W. Rose
+#  * Copyright (c) 2018 Paul Maevskikh
+#  *
+#  * MIT License, see LICENSE.MIT file.
+#  */ 
+
+#  Copyright (c) 2024 NORCE
 #   This file is part of the Open Porous Media project (OPM).
 
 #   OPM is free software: you can redistribute it and/or modify

diff --git a/opm/ml/ml_tools/models/test_dense_10x1.model b/opm/ml/ml_tools/models/test_dense_10x1.model
diff --git a/opm/ml/ml_tools/models/test_dense_10x10.model b/opm/ml/ml_tools/models/test_dense_10x10.model
diff --git a/opm/ml/ml_tools/models/test_dense_10x10x10.model b/opm/ml/ml_tools/models/test_dense_10x10x10.model
diff --git a/opm/ml/ml_tools/models/test_dense_1x1.model b/opm/ml/ml_tools/models/test_dense_1x1.model
diff --git a/opm/ml/ml_tools/models/test_dense_2x2.model b/opm/ml/ml_tools/models/test_dense_2x2.model
diff --git a/opm/ml/ml_tools/models/test_dense_relu_10.model b/opm/ml/ml_tools/models/test_dense_relu_10.model
diff --git a/opm/ml/ml_tools/models/test_dense_tanh_10.model b/opm/ml/ml_tools/models/test_dense_tanh_10.model
diff --git a/opm/ml/ml_tools/models/test_relu_10.model b/opm/ml/ml_tools/models/test_relu_10.model
diff --git a/opm/ml/ml_tools/models/test_scalingdense_1x1.model b/opm/ml/ml_tools/models/test_scalingdense_1x1.model
diff --git a/opm/ml/ml_tools/scaler_layers.py b/opm/ml/ml_tools/scaler_layers.py
@@ -1,6 +1,5 @@
-#  Copyright (c) 2024 Birane Kane
-#  Copyright (c) 2024 Tor Harald Sandve
-#  Copyright (c) 2024 Peter Moritz von Schultzendorff
+#  Copyright (c) 2024 NORCE
+#  Copyright (c) 2024 UiB
 
 #   This file is part of the Open Porous Media project (OPM).
 

diff --git a/opm/ml/ml_tools/scalertest.py b/opm/ml/ml_tools/scalertest.py
@@ -1,6 +1,5 @@
-#  Copyright (c) 2024 Birane Kane
-#  Copyright (c) 2024 Tor Harald Sandve
-#  Copyright (c) 2024 Peter Moritz von Schultzendorff
+#  Copyright (c) 2024 NORCE
+#  Copyright (c) 2024 UiB
 
 #   This file is part of the Open Porous Media project (OPM).
 
@@ -17,8 +16,6 @@
 #   You should have received a copy of the GNU General Public License
 #   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 
-
-
 from __future__ import annotations
 
 import pathlib
@@ -40,58 +37,14 @@
 
 data: np.ndarray = np.random.uniform(-500, 500, (5, 1))
 
-# model: keras.Model = keras.Sequential(
-#
-#     [
-#
-#         keras.layers.Input([10]),
-#
-#         MinMaxScalerLayer(feature_range=feature_ranges[0]),
-#
-#         keras.layers.Dense(units=10),
-#
-#         MinMaxUnScalerLayer(feature_range=feature_ranges[1]),
-#
-#     ]
-#
-# )
-
 model = Sequential()
 model.add(keras.layers.Input([1]))
 model.add(MinMaxScalerLayer(feature_range=(0.0, 1.0)))
-# model.add(Flatten())
 model.add(Dense(1, input_dim=1))
 model.add(Dense(1, input_dim=1))
 model.add(Dense(1, input_dim=1))
 model.add(Dense(1, input_dim=1))
 
 model.add(MinMaxUnScalerLayer(feature_range=(-3.7, -1.0)))
-#
-# model.get_layer(model.layers[0].name).adapt(data=data)
-# model.get_layer(model.layers[-1].name).adapt(data=data)
-
-# model.add(Dense(1, input_dim=1))
-
-# model: keras.Model = keras.Sequential(
-#
-#     [
-#
-#         keras.layers.Input([1]),
-#
-#         MinMaxScalerLayer(feature_range=(0.0, 1.0)),
-#
-#         # keras.layers.Dense(1, input_dim=1),
-#
-#         # MinMaxUnScalerLayer(feature_range=(0.0, 1.0)),
-#
-#     ]
-#
-# )
-
-
-#
-# model.get_layer(model.layers[0].name).adapt(data=data)
-# #
-# model.get_layer(model.layers[-1].name).adapt(data=data)
 
 export_model(model, str(savepath))
diff --git a/opm/ml/keras_model_test.cpp → tests/ml/keras_model_test.cpp b/opm/ml/keras_model_test.cpp → tests/ml/keras_model_test.cpp
@@ -3,12 +3,11 @@
  * Copyright (c) 2016 Robert W. Rose
  * Copyright (c) 2018 Paul Maevskikh
  *
- * MIT License, see LICENSE.OLD file.
+ * MIT License, see LICENSE.MIT file.
  */ 
 
 /*
- * Copyright (c) 2024 Birane Kane
- * Copyright (c) 2024 Tor Harald Sandve
+  Copyright (c) 2024 NORCE
   This file is part of the Open Porous Media project (OPM).
 
   OPM is free software: you can redistribute it and/or modify
@@ -25,18 +24,18 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "keras_model.hpp"
+#include <opm/ml/keras_model.hpp>
 #include <iostream>
 #include <stdio.h>
-#include "ml_tools/include/test_dense_10x1.h"
-#include "ml_tools/include/test_dense_10x10.h"
-#include "ml_tools/include/test_dense_10x10x10.h"
-#include "ml_tools/include/test_dense_1x1.h"
-#include "ml_tools/include/test_dense_2x2.h"
-#include "ml_tools/include/test_relu_10.h"
-#include "ml_tools/include/test_dense_relu_10.h"
-#include "ml_tools/include/test_dense_tanh_10.h"
-#include "ml_tools/include/test_scalingdense_1x1.h"
+#include <tests/ml/ml_tools/include/test_dense_10x1.hpp>
+#include <tests/ml/ml_tools/include/test_dense_10x10.hpp>
+#include <tests/ml/ml_tools/include/test_dense_10x10x10.hpp>
+#include <tests/ml/ml_tools/include/test_dense_1x1.hpp>
+#include <tests/ml/ml_tools/include/test_dense_2x2.hpp>
+#include <tests/ml/ml_tools/include/test_relu_10.hpp>
+#include <tests/ml/ml_tools/include/test_dense_relu_10.hpp>
+#include <tests/ml/ml_tools/include/test_dense_tanh_10.hpp>
+#include <tests/ml/ml_tools/include/test_scalingdense_10x1.hpp>
 
 
 namespace Opm {
@@ -149,9 +148,9 @@ bool tensor_test() {
     return true;
 }
 
-
 }
 
+
 int main() {
     typedef Opm::DenseAd::Evaluation<double, 1> Evaluation;
 
@@ -194,7 +193,7 @@ int main() {
         return 1;
     }
 
-    if (!test_scalingdense_1x1<Evaluation>(&load_time, &apply_time)) {
+    if (!test_scalingdense_10x1<Evaluation>(&load_time, &apply_time)) {
         return 1;
     }