Merge pull request #29 from DifferentiableUniverseInitiative/u/EiffL/…

…cleanup Cleanup to finish code update, and move notebooks around
DifferentiableUniverseInitiative · Aug 3, 2021 · 0d2ca1e · 0d2ca1e
2 parents 1a44b2c + 6ad4e0e
commit 0d2ca1e
Show file tree

Hide file tree

Showing 9 changed files with 360 additions and 551 deletions.
diff --git a/diffhod/components.py b/diffhod/components.py
@@ -94,14 +94,15 @@ def Zheng07SatsRelaxedBernoulli(Mhalo,
 def NFWProfile(pos, concentration, Rvir, sample_shape, **kwargs):
   '''
     '''
-  pos = ed.as_random_variable(tfd.TransformedDistribution(
+  pos = ed.RandomVariable(tfd.TransformedDistribution(
       distribution=tfd.VonMisesFisher(
           tf.one_hot(tf.zeros_like(concentration, dtype=tf.int32), 3), 0),
-      bijector=tfb.AffineScalar(shift=pos,
-                                scale=tf.expand_dims(ed.as_random_variable(
-                                    NFW(concentration, Rvir, name='radius'),
-                                    sample_shape=sample_shape),
-                                                     axis=-1)),
+      bijector=tfb.Shift(pos)(tfb.Scale(
+          tf.expand_dims(ed.RandomVariable(NFW(concentration,
+                                               Rvir,
+                                               name='radius'),
+                                           sample_shape=sample_shape),
+                         axis=-1))),
       name='position'),
-                              sample_shape=sample_shape)
+                          sample_shape=sample_shape)
   return pos
diff --git a/nb/NFW_sampling.ipynb → nb/dev/NFW_sampling.ipynb b/nb/NFW_sampling.ipynb → nb/dev/NFW_sampling.ipynb
diff --git a/nb/dev/dhod_Ngal.ipynb b/nb/dev/dhod_Ngal.ipynb
diff --git a/nb/dhod_centrals_gs.ipynb → nb/dev/dhod_centrals_gs.ipynb b/nb/dhod_centrals_gs.ipynb → nb/dev/dhod_centrals_gs.ipynb
diff --git a/nb/dhod_zheng07.ipynb → nb/dev/dhod_zheng07.ipynb b/nb/dhod_zheng07.ipynb → nb/dev/dhod_zheng07.ipynb
@@ -293,7 +293,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.3"
+   "version": "3.9.6"
   }
  },
  "nbformat": 4,

diff --git a/nb/dhod_Ngal.ipynb b/nb/dhod_Ngal.ipynb
diff --git a/nb/power_spectra_comparison.ipynb b/nb/power_spectra_comparison.ipynb
diff --git a/nb/ps_test.ipynb b/nb/ps_test.ipynb
diff --git a/setup.py b/setup.py
@@ -1,12 +1,23 @@
 #!/usr/bin/env python
 from setuptools import setup, find_packages
 
-__version__ = '0.1'
-
 setup(name='diffhod',
-      version=__version__,
-      python_requires='>3.5.2',
-      description='differentiable HOD',
+      description="Differentiable Halo Occupation Distribution",
+      python_requires='>3.6',
+      author="DiffHOD developers",
       packages=find_packages(),
       install_requires=['tensorflow-probability', 'edward2'],
-      tests_require=['halotools'])
+      tests_require=['halotools'],
+      use_scm_version=True,
+      setup_requires=["setuptools_scm"],
+      classifiers=[
+          "Programming Language :: Python :: 3.6",
+          "Programming Language :: Python :: 3.7",
+          "Programming Language :: Python :: 3.8",
+          "License :: OSI Approved :: MIT License",
+          "Operating System :: MacOS",
+          "Operating System :: POSIX :: Linux",
+          "Topic :: Scientific/Engineering",
+          "Intended Audience :: Science/Research",
+          "Intended Audience :: Developers",
+      ])