Merge pull request #189 from astro-informatics/housekeeping/debug_183

Fix small bugs from issue 183

Author: CosmoMatt

notebooks/custom_gradients.ipynb

@@ -19,14 +19,13 @@
     "os.environ['CUDA_VISIBLE_DEVICES'] = ''\n",
     "os.environ['JAX_CHECK_TRACER_LEAKS'] = 'True'\n",
     "\n",
-    "from jax.config import config\n",
-    "config.update(\"jax_enable_x64\", True)\n",
+    "import jax\n",
+    "jax.config.update(\"jax_enable_x64\", True)\n",
     "\n",
     "# Check we're running on GPU\n",
     "from jax.lib import xla_bridge\n",
     "print(xla_bridge.get_backend().platform)\n",
     "\n",
-    "import jax\n",
     "from jax import jit, grad \n",
     "import jax.numpy as jnp \n",
     "from jax.test_util import check_grads\n",
@@ -98,7 +97,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.0"
+   "version": "3.10.4"
   },
   "orig_nbformat": 4,
   "vscode": {

notebooks/spherical_harmonic_transform.ipynb

@@ -28,8 +28,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from jax.config import config\n",
-    "config.update(\"jax_enable_x64\", True)\n",
+    "import jax\n",
+    "jax.config.update(\"jax_enable_x64\", True)\n",
     "\n",
     "import numpy as np\n",
     "import s2fft \n",
@@ -199,7 +199,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3.8.16 64-bit ('s2fft')",
+   "display_name": "Python 3.10.4 ('s2fft')",
    "language": "python",
    "name": "python3"
   },
@@ -213,12 +213,12 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.16"
+   "version": "3.10.4"
   },
   "orig_nbformat": 4,
   "vscode": {
    "interpreter": {
-    "hash": "d6019e21eb0d27eebd69283f1089b8b605b46cb058a452b887458f3af7017e46"
+    "hash": "3425e24474cbe920550266ea26b478634978cc419579f9dbcf479231067df6a3"
    }
   }
  },

notebooks/spherical_rotation.ipynb

@@ -30,8 +30,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from jax.config import config\n",
-    "config.update(\"jax_enable_x64\", True)\n",
+    "import jax\n",
+    "jax.config.update(\"jax_enable_x64\", True)\n",
     "\n",
     "import numpy as np\n",
     "import s2fft \n",

notebooks/wigner_transform.ipynb

@@ -28,8 +28,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from jax.config import config\n",
-    "config.update(\"jax_enable_x64\", True) \n",
+    "import jax\n",
+    "jax.config.update(\"jax_enable_x64\", True)\n",
     "\n",
     "import numpy as np\n",
     "import s2fft \n",

s2fft/__init__.py

@@ -10,9 +10,9 @@
 from .utils.rotation import rotate_flms, generate_rotate_dls
 
 import logging
-from jax.config import config
+import jax
 
-if config.read("jax_enable_x64") is False:
+if jax.config.read("jax_enable_x64") is False:
     logger = logging.getLogger("s2fft")
     logger.warning(
         "JAX is not using 64-bit precision. This will dramatically affect numerical precision at even moderate L."

s2fft/precompute_transforms/construct.py

@@ -1,6 +1,6 @@
-from jax import config
+import jax
 
-config.update("jax_enable_x64", True)
+jax.config.update("jax_enable_x64", True)
 
 import numpy as np
 import jax.numpy as jnp

s2fft/recursions/risbo.py

@@ -5,7 +5,7 @@ def compute_full(dl: np.ndarray, beta: float, L: int, el: int) -> np.ndarray:
     r"""Compute Wigner-d at argument :math:`\beta` for full plane using
     Risbo recursion.
 
-    The Wigner-d plane is computed by recursion over :math:`\ell` (`el`).
+    The Wigner-d plane is computed by recursion over :math:`\ell`.
     Thus, for :math:`\ell > 0` the plane must be computed already for
     :math:`\ell - 1`. At present, for :math:`\ell = 0` the recusion is initialised.
 
@@ -19,7 +19,7 @@ def compute_full(dl: np.ndarray, beta: float, L: int, el: int) -> np.ndarray:
         el (int): Spherical harmonic degree :math:`\ell`.
 
     Returns:
-        np.ndarray: Plane of Wigner-d for `el` and `beta`, with full plane computed.
+        np.ndarray: Plane of Wigner-d for :math:`\ell` and :math:`\beta`, with full plane computed.
     """
 
     _arg_checks(dl, beta, L, el)
@@ -103,7 +103,7 @@ def compute_full(dl: np.ndarray, beta: float, L: int, el: int) -> np.ndarray:
 
 
 def _arg_checks(dl: np.ndarray, beta: float, L: int, el: int):
-    """Check arguments of Risbo functions.
+    r"""Check arguments of Risbo functions.
 
     Args:
         dl (np.ndarray): Wigner-d plane of which to check shape.

s2fft/transforms/spherical.py

@@ -296,7 +296,7 @@ def f_bwd(res, gtm):
         ftm = ftm.at[:, m_start_ind + m_offset :].multiply(phase_shifts)
 
     # Perform longitundal Fast Fourier Transforms
-    ftm *= (-1) ** spin
+    ftm *= (-1) ** jnp.abs(spin)
     if reality:
         ftm = ftm.at[:, m_offset : L - 1 + m_offset].set(
             jnp.flip(jnp.conj(ftm[:, L - 1 + m_offset + 1 :]), axis=-1)
@@ -657,4 +657,4 @@ def f_bwd(res, glm):
     indices = jnp.repeat(jnp.expand_dims(jnp.arange(L), -1), 2 * L - 1, axis=-1)
     flm = jnp.where(indices < abs(spin), jnp.zeros_like(flm), flm[..., :])
 
-    return flm * (-1) ** spin
+    return flm * (-1) ** jnp.abs(spin)

s2fft/transforms/wigner.py

@@ -259,7 +259,7 @@ def inverse_jax(
     def spherical_loop(n, args):
         fban, flmn, lrenorm, vsign, spins = args
         fban = fban.at[n].add(
-            (-1) ** spins[n]
+            (-1) ** jnp.abs(spins[n])
             * s2fft.inverse_jax(
                 flmn[n],
                 L,

s2fft/utils/rotation.py

@@ -37,7 +37,7 @@ def rotate_flms(
     dl = (
         dl_array
         if dl_array != None
-        else jnp.zeros((2 * L - 1, 2 * L - 1)).astype(jnp.complex128)
+        else jnp.zeros((2 * L - 1, 2 * L - 1)).astype(jnp.float64)
     )
 
     # Perform rotation