Skip to content

Commit e9cd376

Browse files
committed
Major update to use TF v2.17. Concrete dropout layers no longer work due to TF/Keras changes, will be fixed later.
1 parent fc95b3c commit e9cd376

32 files changed

+2780
-953
lines changed

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ neural network models.
44

55
This project was completed with the support of the NASA Fellowship Activity,
66
grant 80NSSC20K0682, held by Principal Investigator Joseph Harrington in
7-
support of Michael Himes, the principal developer of HOMER. Adam D. Cobb,
7+
support of Michael Himes, the principal developer of MARGE. Adam D. Cobb,
88
David C. Wright, and Zacchaeus Scheffer contributed to some aspects of the
9-
code, as described in the MARGE documentation.
9+
published version of the code, as described in the MARGE documentation.
1010

1111
-------------------------------------------------------------------------------
1212

MARGE.py

100755100644
Lines changed: 277 additions & 203 deletions
Large diffs are not rendered by default.

doc/MARGE_user_manual/MARGE_user_manual.tex

Lines changed: 249 additions & 117 deletions
Large diffs are not rendered by default.

environment.yml

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
11
name: marge
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
6-
- mpi4py=3.0.3
7-
- mpich=3.3.2
8-
- pip=19.0.3
9-
- cython=0.29.5
10-
- h5py=2.9.0
11-
- hdf5=1.10.4
12-
- matplotlib=3.0.2
13-
- numpy=1.16.2
14-
- python=3.7.2
15-
- scikit-learn=0.20.2
16-
- scipy=1.2.1
17-
- yaml=0.1.7
18-
- tensorflow-gpu==1.13.1
19-
- keras==2.2.4
20-
- pip:
21-
- -rrequirements.txt --install-option="--no-deps"
5+
- cudnn=9.3.0.75
6+
- dask=2024.12.0
7+
- h5py=3.12.1
8+
- keras=3.7.0
9+
- matplotlib=3.10.0
10+
- numpy=1.26.4
11+
- optuna=4.1.0
12+
- scikit-learn=1.6.0
13+
- scipy=1.14.1
14+
- tensorflow-gpu=2.17.0
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/README renamed to example/BART_example/README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Introduction
22
============
33

4-
This directory holds an example of how to run MARGE, using BART for data
5-
generation. It matches the use case demonstrated in Himes et al. (2020), except
4+
This directory holds an example of how to run MARGE using BART for data
5+
generation. It matches the use case demonstrated in Himes et al. (2022), except
66
with reduced accuracy to reduce the runtime.
77

88
********************************** IMPORTANT **********************************

0 commit comments

Comments
 (0)