updates to use python 3.9.x

ccsc-tools · Dec 8, 2022 · 09c5973 · 09c5973
1 parent e6943be
commit 09c5973
Show file tree

Hide file tree

Showing 29 changed files with 7,081 additions and 6,681 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.ipynb_checkpoints
+CMEpredict/__pycache__
diff --git a/CMEpredict/CMEpredict.py b/CMEpredict/CMEpredict.py
@@ -27,6 +27,7 @@
 sys.stderr = open(os.devnull, 'w')
 from keras.models import *
 from keras.layers import *
+from tensorflow.keras import regularizers
 sys.stderr = stderr
 
 import numpy as np
@@ -280,7 +281,7 @@ def get_n_features_thresh(type, time_window):
                                                type=type,
                                                time_window=time_window)
 
-        class_weights = class_weight.compute_class_weight('balanced', np.unique(y_train), y_train)
+        class_weights = class_weight.compute_class_weight('balanced', classes=np.unique(y_train), y=y_train)
         class_weight_ = {0: class_weights[0], 1: class_weights[1]}
         print('done loading training data...')
 

diff --git a/CMEpredict/ReadMe.txt b/CMEpredict/ReadMe.txt
@@ -20,5 +20,5 @@ The fourth argument "0" denotes that the program will load and use the pre-train
 
 The output obtained by executing the above command is stored in the file named gru-x-output.csv or lstm-x-output.csv in the zip. This output file is the same as the normalized_testing_x file except that it has one additional column (the first column) titled "Predicted Label," which contains labels predicted by our program. The value "padding" is removed from the output file.
 
-Our program is run on Python 3.6.8, Keras 2.2.4, and TensorFlow 1.12.0.
+Our program is run on Python 3.9.7, Keras 2.2.4, and TensorFlow 2.8.0.
 
diff --git a/CMEpredict/gru-12-model.h5 b/CMEpredict/gru-12-model.h5
diff --git a/CMEpredict/gru-12-output.csv b/CMEpredict/gru-12-output.csv
diff --git a/CMEpredict/gru-24-model.h5 b/CMEpredict/gru-24-model.h5
diff --git a/CMEpredict/gru-24-output.csv b/CMEpredict/gru-24-output.csv
diff --git a/CMEpredict/gru-36-model.h5 b/CMEpredict/gru-36-model.h5
diff --git a/CMEpredict/gru-36-output.csv b/CMEpredict/gru-36-output.csv
diff --git a/CMEpredict/gru-48-model.h5 b/CMEpredict/gru-48-model.h5
diff --git a/CMEpredict/gru-48-output.csv b/CMEpredict/gru-48-output.csv
diff --git a/CMEpredict/gru-60-model.h5 b/CMEpredict/gru-60-model.h5
diff --git a/CMEpredict/gru-60-output.csv b/CMEpredict/gru-60-output.csv
diff --git a/CMEpredict/lstm-12-model.h5 b/CMEpredict/lstm-12-model.h5
diff --git a/CMEpredict/lstm-12-output.csv b/CMEpredict/lstm-12-output.csv
diff --git a/CMEpredict/lstm-24-model.h5 b/CMEpredict/lstm-24-model.h5
diff --git a/CMEpredict/lstm-24-output.csv b/CMEpredict/lstm-24-output.csv
diff --git a/CMEpredict/lstm-36-model.h5 b/CMEpredict/lstm-36-model.h5
diff --git a/CMEpredict/lstm-36-output.csv b/CMEpredict/lstm-36-output.csv
diff --git a/CMEpredict/lstm-48-model.h5 b/CMEpredict/lstm-48-model.h5
diff --git a/CMEpredict/lstm-48-output.csv b/CMEpredict/lstm-48-output.csv
diff --git a/CMEpredict/lstm-60-model.h5 b/CMEpredict/lstm-60-model.h5
diff --git a/CMEpredict/lstm-60-output.csv b/CMEpredict/lstm-60-output.csv
diff --git a/README.md b/README.md
@@ -28,17 +28,17 @@ For the latest updates of CMEPredict refer to [https://github.com/deepsuncode/RN
 
 ## Installation on local machine
 
-Requires `Python==3.6.x` (was tested on 3.6.8)
+Requires `Python==3.9.x` (was tested on 3.9.7)
 
 Run `pip install -r requirements.txt` (recommended), or manually install the following packages and specified versions:
 
 | Library      | Version | Description                    |
 |--------------|---------|--------------------------------|
-| pandas       | 1.1.5   | Data analysis                  |
-| scikit-learn | 0.24.2  | Neural network libraries       |
-| matplotlib   | 3.3.4   | Plotting and graphs            |
-| h5py         | 2.10.0  | Data storage and management    |
-| tensorflow   | 1.12.0  | Neural network libraries       |
+| numpy       | 1.21.6  | Data processing                  |
+| pandas       | 1.4.4   | Data analysis                  |
+| scikit-learn | 1.0.1  | Neural network libraries       |
+| matplotlib   | 3.5.2   | Plotting and graphs            |
+| tensorflow-gpu   | 2.8.0  | Neural network libraries       |
 | keras        | 2.2.4   | Artificial neural networks API |
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,5 +20,5 @@ The fourth argument "0" denotes that the program will load and use the pre-train

		The output obtained by executing the above command is stored in the file named gru-x-output.csv or lstm-x-output.csv in the zip. This output file is the same as the normalized_testing_x file except that it has one additional column (the first column) titled "Predicted Label," which contains labels predicted by our program. The value "padding" is removed from the output file.

		Our program is run on Python 3.6.8, Keras 2.2.4, and TensorFlow 1.12.0.
		Our program is run on Python 3.9.7, Keras 2.2.4, and TensorFlow 2.8.0.