From ff734d5e84fee66645bbe0bc847030260bf7a82b Mon Sep 17 00:00:00 2001 From: KevinCawley Date: Thu, 13 May 2021 10:01:02 -0500 Subject: [PATCH 1/6] Fix jitclass --- tardis/montecarlo/montecarlo_numba/formal_integral.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tardis/montecarlo/montecarlo_numba/formal_integral.py b/tardis/montecarlo/montecarlo_numba/formal_integral.py index b4b791b1b37..0c7d3c6627c 100644 --- a/tardis/montecarlo/montecarlo_numba/formal_integral.py +++ b/tardis/montecarlo/montecarlo_numba/formal_integral.py @@ -6,7 +6,8 @@ from scipy.interpolate import interp1d from astropy import units as u from tardis import constants as const -from numba import njit, char, float64, int64, jitclass, typeof, byte, prange +from numba import njit, char, float64, int64, typeof, byte, prange +from numba.experimental import jitclass import pdb from tardis.montecarlo.montecarlo_numba.numba_config import SIGMA_THOMSON From 88bfb38579b86b434bafc49059cae8339f8d8d99 Mon Sep 17 00:00:00 2001 From: KevinCawley Date: Thu, 13 May 2021 10:03:04 -0500 Subject: [PATCH 2/6] update numba version to not be fixed --- tardis_env3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis_env3.yml b/tardis_env3.yml index a10de0ac238..c3fb272faf6 100644 --- a/tardis_env3.yml +++ b/tardis_env3.yml @@ -10,7 +10,7 @@ dependencies: - scipy=1.5 - pandas=1.0 - astropy=3 - - numba=0.50 + - numba - numexpr # Plasma From e66585c4ec3fb96f949f82510fcb096173ed7dab Mon Sep 17 00:00:00 2001 From: KevinCawley <72036796+KevinCawley@users.noreply.github.com> Date: Thu, 20 May 2021 10:01:23 -0500 Subject: [PATCH 3/6] Move pickle5 to pip section --- tardis_env3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis_env3.yml b/tardis_env3.yml index c3fb272faf6..70d7b9dfd53 100644 --- a/tardis_env3.yml +++ b/tardis_env3.yml @@ -26,7 +26,6 @@ dependencies: - tqdm - beautifulsoup4 - lxml - - pickle5 # Analysis - jupyter @@ -75,3 +74,4 @@ dependencies: - dot2tex - sphinx-jsonschema - git+https://github.com/Naereen/dot2tex.git + - pickle5 From 7fb0ccc4d4c915b046e85593cf242c8d4e7aae7a Mon Sep 17 00:00:00 2001 From: KevinCawley <72036796+KevinCawley@users.noreply.github.com> Date: Thu, 20 May 2021 10:05:37 -0500 Subject: [PATCH 4/6] Move pickle5 back to conda-forge --- tardis_env3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis_env3.yml b/tardis_env3.yml index 70d7b9dfd53..c3fb272faf6 100644 --- a/tardis_env3.yml +++ b/tardis_env3.yml @@ -26,6 +26,7 @@ dependencies: - tqdm - beautifulsoup4 - lxml + - pickle5 # Analysis - jupyter @@ -74,4 +75,3 @@ dependencies: - dot2tex - sphinx-jsonschema - git+https://github.com/Naereen/dot2tex.git - - pickle5 From 44064c0e946cb59b65141d05d967a264b5ea2f7d Mon Sep 17 00:00:00 2001 From: KevinCawley <72036796+KevinCawley@users.noreply.github.com> Date: Thu, 20 May 2021 14:06:57 -0500 Subject: [PATCH 5/6] Pin numba version to latest stable --- tardis_env3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis_env3.yml b/tardis_env3.yml index c3fb272faf6..a12b11aa0b0 100644 --- a/tardis_env3.yml +++ b/tardis_env3.yml @@ -10,7 +10,7 @@ dependencies: - scipy=1.5 - pandas=1.0 - astropy=3 - - numba + - numba=.53.1 - numexpr # Plasma From 5d586bb818ef4fa0414ed1867e540b29ca1498ef Mon Sep 17 00:00:00 2001 From: KevinCawley <72036796+KevinCawley@users.noreply.github.com> Date: Thu, 20 May 2021 14:11:49 -0500 Subject: [PATCH 6/6] Leading 0 --- tardis_env3.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tardis_env3.yml b/tardis_env3.yml index a12b11aa0b0..6ffd66c46da 100644 --- a/tardis_env3.yml +++ b/tardis_env3.yml @@ -10,7 +10,7 @@ dependencies: - scipy=1.5 - pandas=1.0 - astropy=3 - - numba=.53.1 + - numba=0.53.1 - numexpr # Plasma