Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying for tensorflow 2.9 #1973

Merged
merged 6 commits into from
Oct 5, 2022
Merged

Trying for tensorflow 2.9 #1973

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
809def1
Updating to tensorflow 2.9
joshua-cogliati-inl Sep 20, 2022
55102c6
Regold files changed by tensorflow update.
joshua-cogliati-inl Sep 21, 2022
11933cb
Increasing relative error.
joshua-cogliati-inl Sep 21, 2022
4c36d01
Updating some more libraries.
joshua-cogliati-inl Sep 21, 2022
99fd297
Updating for mac.
joshua-cogliati-inl Sep 26, 2022
84d278e
Removing os specific tensorflow versions.
joshua-cogliati-inl Sep 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ Note all install methods after "main" take
<dependencies>
<main>
<h5py/>
<numpy>1.18</numpy>
<scipy>1.5</scipy>
<numpy>1.21</numpy>
<scipy>1.7</scipy>
<scikit-learn>1.0</scikit-learn>
<pandas>1.1</pandas>
<xarray>0.16</xarray>
<pandas>1.3</pandas>
<xarray>0.20</xarray>
<netcdf4>1.5</netcdf4>
<matplotlib>3.2</matplotlib>
<statsmodels>0.13</statsmodels>
<cloudpickle>1.6</cloudpickle>
<tensorflow os='windows,linux'>2.3</tensorflow>
<tensorflow os='mac'>2.7</tensorflow>
<cloudpickle>2.2</cloudpickle>
<tensorflow os='windows,linux'>2.9</tensorflow>
<tensorflow os='mac'>2.9</tensorflow>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can these be combined?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, yes.

<python skip_check='True'>3</python>
<hdf5 skip_check='True'/>
<swig skip_check='True'/>
Expand All @@ -63,11 +63,11 @@ Note all install methods after "main" take
<ray source="pip" pip_extra="[default]">1.13</ray>
<!-- redis is needed by ray, but on windows, this seems to need to be explicitly stated -->
<redis source="pip" os='windows'/>
<imageio>2.9</imageio>
<imageio>2.22</imageio>
<line_profiler optional='True'/>
<!-- <ete3 optional='True'/> -->
<pywavelets optional='True'>1.1</pywavelets>
<numdifftools source="pip">0.9.39</numdifftools>
<numdifftools source="pip">0.9</numdifftools>
<fmpy optional='True'/>
<xmlschema source="pip"/>
<pyomo optional='True'>6.4</pyomo>
Expand Down
21,698 changes: 10,849 additions & 10,849 deletions tests/framework/CodeInterfaceTests/gold/DMInterfaceTestTimedep/DB_BouncingBallDump.csv
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/framework/MCMC/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
[./csv]
type = OrderedCSV
output = 'TenDimPropMVN/posterior_basicStat_dump.csv'
rel_err = 0.001
rel_err = 3.0e-1
[../]
[../]
[./AdaptiveMetropolis]
Expand Down
6 changes: 3 additions & 3 deletions tests/framework/PostProcessors/TSACharacterizer/gold/Basic/chz.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ARMA__signal_a__MA__0,Fourier__signal_fa__period2.0__amplitude,ARMA__signal_fa__MA__2,ARMA__signal_a__AR__0,Fourier__signal_fa__period10.0__phase,Fourier__signal_f__period5.0__amplitude,ARMA__signal_a__variance,ARMA__signal_fa__MA__1,Fourier__signal_fa__period5.0__amplitude,Fourier__signal_f__period10.0__amplitude,Fourier__signal_fa__period2.0__phase,ARMA__signal_fa__AR__1,Fourier__signal_f__period5.0__phase,ARMA__signal_fa__variance,Fourier__signal_f__fit_intercept,Fourier__signal_f__period2.0__phase,ARMA__signal_a__MA__2,Fourier__signal_fa__fit_intercept,ARMA__signal_a__constant,ARMA__signal_fa__constant,ARMA__signal_a__MA__1,Fourier__signal_f__period10.0__phase,Fourier__signal_fa__period10.0__amplitude,ARMA__signal_fa__MA__0,Fourier__signal_f__period2.0__amplitude,Fourier__signal_fa__period5.0__phase,ARMA__signal_fa__AR__0,ARMA__signal_a__AR__1
-1.144278555,2.27119924552,-0.0784345377849,1.75724085587,-3.08854058527,3.0,0.531122350556,0.177036343041,3.00629571435,4.0,-0.165113659694,-0.439315067829,0.785398163397,0.545082797826,42.0,1.55431223448e-15,-0.0764776124073,41.8908824287,0.00810345204201,0.0118581832304,0.226235059701,-3.14159265359,3.6485771704,-0.758810071785,2.0,0.763083169957,1.35283987501,-0.7588713656
-1.09280740147,2.77834476114,-0.240237603773,1.764752158,-3.13023980907,1.0,0.274702344062,0.418299326266,0.678339437727,2.0,0.00410650639164,-0.781223497293,0.785398163397,0.277960331434,20.0,2.51650552248e-15,-0.239683444112,20.0760911024,0.0180725528697,0.0193421236263,0.403929424265,-3.14159265359,2.27417407299,-1.11631040959,3.0,0.587758626516,1.77506248123,-0.772077969731
ARMA__signal_fa__AR__0,ARMA__signal_fa__MA__0,ARMA__signal_a__variance,Fourier__signal_f__period2.0__amplitude,ARMA__signal_a__MA__0,ARMA__signal_a__MA__2,Fourier__signal_f__fit_intercept,Fourier__signal_fa__period10.0__amplitude,Fourier__signal_f__period10.0__phase,Fourier__signal_f__period5.0__amplitude,Fourier__signal_fa__period2.0__amplitude,Fourier__signal_f__period5.0__phase,ARMA__signal_fa__variance,Fourier__signal_fa__period10.0__phase,ARMA__signal_fa__AR__1,Fourier__signal_fa__period2.0__phase,ARMA__signal_a__MA__1,ARMA__signal_fa__constant,Fourier__signal_f__period2.0__phase,ARMA__signal_a__constant,Fourier__signal_fa__period5.0__amplitude,ARMA__signal_fa__MA__1,ARMA__signal_a__AR__1,ARMA__signal_fa__MA__2,ARMA__signal_a__AR__0,Fourier__signal_f__period10.0__amplitude,Fourier__signal_fa__fit_intercept,Fourier__signal_fa__period5.0__phase
1.35283996982,-0.758810167613,0.531122354439,2.0,-1.14427852989,-0.076477629994,42.0,3.6485771704,-3.14159265359,3.0,2.27119924552,0.785398163397,0.545082800467,-3.08854058527,-0.439315122861,-0.165113659694,0.226235050274,0.0118581671617,3.33066907388e-15,0.00810342748135,3.00629571435,0.177036359223,-0.758871345573,-0.0784345793487,1.75724083583,4.0,41.8908824287,0.763083169957
1.77466810604,-1.11598524403,0.274702459947,3.0,-1.09280887354,-0.239683970685,20.0,2.27417407299,-3.14159265359,1.0,2.77834476114,0.785398163397,0.277903101725,-3.13023980907,-0.78093138234,0.00410650639164,0.403930541596,0.0212214313493,3.25665420557e-15,0.0180684339995,0.678339437727,0.418116538363,-0.772078781249,-0.24007592617,1.76475307449,2.0,20.0760911024,0.587758626516
2 changes: 1 addition & 1 deletion tests/framework/PostProcessors/TSACharacterizer/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
input = 'basic.xml'
output = 'Basic/chz.xml'
csv = 'Basic/chz.csv'
rel_err = 0.06 # limited by ARMA__signal_fa__constant
rel_err = 1.5e-1 # limited by ARMA__signal_fa__constant
zero_threshold = 1e-12
[../]
[./RWD]
Expand Down
Loading