integrate-module 0.99.0__tar.gz → 0.99.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. {integrate_module-0.99.0/integrate_module.egg-info → integrate_module-0.99.2}/PKG-INFO +82 -26
  2. {integrate_module-0.99.0 → integrate_module-0.99.2}/README.md +65 -21
  3. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/__init__.py +2 -1
  4. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate.py +258 -35
  5. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_io.py +1 -1
  6. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_plot.py +384 -440
  7. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_query.py +48 -13
  8. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_rejection.py +34 -8
  9. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_timing_cli.py +5 -3
  10. {integrate_module-0.99.0 → integrate_module-0.99.2/integrate_module.egg-info}/PKG-INFO +82 -26
  11. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate_module.egg-info/requires.txt +15 -0
  12. {integrate_module-0.99.0 → integrate_module-0.99.2}/pyproject.toml +19 -8
  13. {integrate_module-0.99.0 → integrate_module-0.99.2}/LICENSE +0 -0
  14. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/gex.py +0 -0
  15. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_borehole.py +0 -0
  16. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_hdf5_info_cli.py +0 -0
  17. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_rejection_cli.py +0 -0
  18. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_rejection_jax.py +0 -0
  19. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate/integrate_www_cli.py +0 -0
  20. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate_module.egg-info/SOURCES.txt +0 -0
  21. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate_module.egg-info/dependency_links.txt +0 -0
  22. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate_module.egg-info/entry_points.txt +0 -0
  23. {integrate_module-0.99.0 → integrate_module-0.99.2}/integrate_module.egg-info/top_level.txt +0 -0
  24. {integrate_module-0.99.0 → integrate_module-0.99.2}/setup.cfg +0 -0
  25. {integrate_module-0.99.0 → integrate_module-0.99.2}/tests/test_likelihood_multinomial.py +0 -0
@@ -1,13 +1,13 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: integrate_module
3
- Version: 0.99.0
3
+ Version: 0.99.2
4
4
  Summary: Localized probabilistic data integration
5
5
  Author-email: Thomas Mejer Hansen <tmeha@geo.au.dk>
6
6
  License: MIT
7
- Project-URL: Homepage, https://github.com/cultpenguin/integrate_module
8
- Project-URL: Documentation, https://cultpenguin.github.io/integrate_module/
9
- Project-URL: Repository, https://github.com/cultpenguin/integrate_module
10
- Project-URL: Issues, https://github.com/cultpenguin/integrate_module/issues
7
+ Project-URL: Homepage, https://github.com/AUProbGeo/integrate_module
8
+ Project-URL: Documentation, https://auprobgeo.github.io/integrate_module/
9
+ Project-URL: Repository, https://github.com/AUProbGeo/integrate_module
10
+ Project-URL: Issues, https://github.com/AUProbGeo/integrate_module/issues
11
11
  Keywords: inversion,electromagnetic,geophysics,geology,prior,tarantola
12
12
  Classifier: Programming Language :: Python :: 3
13
13
  Requires-Python: >=3.10
@@ -24,20 +24,32 @@ Requires-Dist: geoprior1d>=0.9
24
24
  Requires-Dist: ga-aem-forward-win; platform_system == "Windows"
25
25
  Requires-Dist: jupyter>=1.0.0
26
26
  Requires-Dist: jupytext
27
+ Requires-Dist: ipykernel
27
28
  Requires-Dist: pandas
28
29
  Requires-Dist: pyvista
29
30
  Requires-Dist: litellm
30
31
  Requires-Dist: streamlit
32
+ Requires-Dist: libaarhusxyz
33
+ Requires-Dist: jax
31
34
  Provides-Extra: dev
32
35
  Requires-Dist: pytest; extra == "dev"
33
36
  Requires-Dist: black; extra == "dev"
37
+ Provides-Extra: docs
38
+ Requires-Dist: sphinx; extra == "docs"
39
+ Requires-Dist: nbsphinx; extra == "docs"
40
+ Requires-Dist: sphinx-gallery; extra == "docs"
41
+ Requires-Dist: pandoc; extra == "docs"
42
+ Requires-Dist: myst-parser; extra == "docs"
43
+ Requires-Dist: sphinx-rtd-theme; extra == "docs"
44
+ Requires-Dist: furo; extra == "docs"
45
+ Requires-Dist: tomli; python_version < "3.11" and extra == "docs"
34
46
  Dynamic: license-file
35
47
 
36
48
  # INTEGRATE Python Module
37
49
 
38
- [![Build Status](https://github.com/cultpenguin/integrate_module/actions/workflows/docs.yml/badge.svg?branch=main)](https://github.com/cultpenguin/integrate_module/actions/workflows/docs.yml)
50
+ [![Build Status](https://github.com/AUProbGeo/integrate_module/actions/workflows/docs.yml/badge.svg?branch=main)](https://github.com/AUProbGeo/integrate_module/actions/workflows/docs.yml)
39
51
  [![PyPI](https://badge.fury.io/py/integrate-module.svg)](https://badge.fury.io/py/integrate-module)
40
- [![Documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://cultpenguin.github.io/integrate_module/)
52
+ [![Documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://auprobgeo.github.io/integrate_module/)
41
53
  [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
42
54
  [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
43
55
 
@@ -48,42 +60,86 @@ This repository contains the INTEGRATE Python module for localized probabilistic
48
60
 
49
61
  Assuming you already have Python 3.10+ installed:
50
62
 
51
- `libaarhusxyz` must be installed manually before installing `integrate_module`, because the version that supports Python >= 3.12 is only available on GitHub (not PyPI):
52
-
53
- pip install git+https://github.com/cultpenguin/libaarhusxyz
54
63
  pip install integrate_module
55
64
 
56
65
  On Windows, this will also install the Python wrapper for GA-AEM (1D EM forward modeling - GPL v2 code): [ga-aem-forward-win](https://pypi.org/project/ga-aem-forward-win/)
57
66
 
58
67
  On Linux/macOS, you will need to install GA-AEM manually.
59
68
 
60
- ### Using pip (from PyPI, on Ubuntu)
69
+ ### Using uv (recommended, from PyPI)
70
+
71
+ [uv](https://github.com/astral-sh/uv) is a fast Python package manager. Install it first if needed:
72
+
73
+ # Install uv (Linux/macOS)
74
+ curl -LsSf https://astral.sh/uv/install.sh | sh
75
+ # or: pip install uv
76
+
77
+ # Create virtual environment in .venv/ inside the module root
78
+ cd path/to/integrate_module
79
+ uv venv .venv --python 3.11
80
+
81
+ # Activate
82
+ source .venv/bin/activate # Linux/macOS
83
+ .venv\Scripts\activate # Windows
84
+
85
+ # Install integrate module
86
+ uv pip install integrate_module
61
87
 
62
- # Install python3 venv
88
+ ### Using uv (from source)
89
+
90
+ # Install uv (Linux/macOS)
91
+ curl -LsSf https://astral.sh/uv/install.sh | sh
92
+ # or: pip install uv
93
+
94
+ # Create .venv and install all dependencies in one step (recommended for development)
95
+ cd path/to/integrate_module
96
+ uv sync
97
+
98
+ # Activate
99
+ source .venv/bin/activate # Linux/macOS
100
+ .venv\Scripts\activate # Windows
101
+
102
+ ### Using pip + venv (from PyPI, on Ubuntu)
103
+
104
+ # Install python3-venv
63
105
  sudo apt install python3-venv
64
-
65
- # Create virtual environment
66
- python3 -m venv ~/integrate
67
- source ~/integrate/bin/activate
106
+
107
+ # Create virtual environment in .venv/ inside the module root
108
+ cd path/to/integrate_module
109
+ python3 -m venv .venv
110
+ source .venv/bin/activate
68
111
  pip install --upgrade pip
69
-
112
+
70
113
  # Install integrate module
71
114
  pip install integrate_module
72
-
73
- ### Using pip (from source, on Ubuntu)
74
115
 
75
- # Install python3 venv
116
+ ### Using pip + venv (from source, on Ubuntu)
117
+
118
+ # Install python3-venv
76
119
  sudo apt install python3-venv
77
120
 
78
- # Create virtual environment
79
- python3 -m venv ~/integrate
80
- source ~/integrate/bin/activate
121
+ # Create virtual environment in .venv/ inside the module root
122
+ cd path/to/integrate_module
123
+ python3 -m venv .venv
124
+ source .venv/bin/activate
81
125
  pip install --upgrade pip
82
126
 
83
- # Install integrate module
84
- cd path/to/integrate_module
127
+ # Install integrate module from source
85
128
  pip install -e .
86
129
 
130
+ ### Installing documentation dependencies
131
+
132
+ To also install the packages needed to build the Sphinx documentation, use the `docs` extra:
133
+
134
+ # With uv (from source)
135
+ uv sync --extra docs
136
+
137
+ # With uv pip (from source)
138
+ uv pip install -e ".[docs]"
139
+
140
+ # With pip (from source)
141
+ pip install -e ".[docs]"
142
+
87
143
  ### Using Conda + pip (from PyPI)
88
144
 
89
145
  Create a Conda environment (called integrate) and install the required modules:
@@ -165,7 +221,7 @@ The `develop` branch contains the current development code and may be updated fr
165
221
  An extra set of tests and examples are located in the ``experimental`` sub-branch `https://github.com/cultpenguin/integrate_module_experimental/ <https://github.com/cultpenguin/integrate_module_experimental/>`_.
166
222
  Please ask the developers for access to this branch if needed. To clone the main repository with the experimental branch, use:
167
223
 
168
- git clone --recurse-submodules git@github.com:cultpenguin/integrate_module.git
224
+ git clone --recurse-submodules git@github.com:AUProbGeo/integrate_module.git
169
225
 
170
226
  You may need to run the following command to update the submodules:
171
227
 
@@ -1,8 +1,8 @@
1
1
  # INTEGRATE Python Module
2
2
 
3
- [![Build Status](https://github.com/cultpenguin/integrate_module/actions/workflows/docs.yml/badge.svg?branch=main)](https://github.com/cultpenguin/integrate_module/actions/workflows/docs.yml)
3
+ [![Build Status](https://github.com/AUProbGeo/integrate_module/actions/workflows/docs.yml/badge.svg?branch=main)](https://github.com/AUProbGeo/integrate_module/actions/workflows/docs.yml)
4
4
  [![PyPI](https://badge.fury.io/py/integrate-module.svg)](https://badge.fury.io/py/integrate-module)
5
- [![Documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://cultpenguin.github.io/integrate_module/)
5
+ [![Documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://auprobgeo.github.io/integrate_module/)
6
6
  [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
7
7
  [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
8
8
 
@@ -13,42 +13,86 @@ This repository contains the INTEGRATE Python module for localized probabilistic
13
13
 
14
14
  Assuming you already have Python 3.10+ installed:
15
15
 
16
- `libaarhusxyz` must be installed manually before installing `integrate_module`, because the version that supports Python >= 3.12 is only available on GitHub (not PyPI):
17
-
18
- pip install git+https://github.com/cultpenguin/libaarhusxyz
19
16
  pip install integrate_module
20
17
 
21
18
  On Windows, this will also install the Python wrapper for GA-AEM (1D EM forward modeling - GPL v2 code): [ga-aem-forward-win](https://pypi.org/project/ga-aem-forward-win/)
22
19
 
23
20
  On Linux/macOS, you will need to install GA-AEM manually.
24
21
 
25
- ### Using pip (from PyPI, on Ubuntu)
22
+ ### Using uv (recommended, from PyPI)
23
+
24
+ [uv](https://github.com/astral-sh/uv) is a fast Python package manager. Install it first if needed:
25
+
26
+ # Install uv (Linux/macOS)
27
+ curl -LsSf https://astral.sh/uv/install.sh | sh
28
+ # or: pip install uv
29
+
30
+ # Create virtual environment in .venv/ inside the module root
31
+ cd path/to/integrate_module
32
+ uv venv .venv --python 3.11
33
+
34
+ # Activate
35
+ source .venv/bin/activate # Linux/macOS
36
+ .venv\Scripts\activate # Windows
37
+
38
+ # Install integrate module
39
+ uv pip install integrate_module
26
40
 
27
- # Install python3 venv
41
+ ### Using uv (from source)
42
+
43
+ # Install uv (Linux/macOS)
44
+ curl -LsSf https://astral.sh/uv/install.sh | sh
45
+ # or: pip install uv
46
+
47
+ # Create .venv and install all dependencies in one step (recommended for development)
48
+ cd path/to/integrate_module
49
+ uv sync
50
+
51
+ # Activate
52
+ source .venv/bin/activate # Linux/macOS
53
+ .venv\Scripts\activate # Windows
54
+
55
+ ### Using pip + venv (from PyPI, on Ubuntu)
56
+
57
+ # Install python3-venv
28
58
  sudo apt install python3-venv
29
-
30
- # Create virtual environment
31
- python3 -m venv ~/integrate
32
- source ~/integrate/bin/activate
59
+
60
+ # Create virtual environment in .venv/ inside the module root
61
+ cd path/to/integrate_module
62
+ python3 -m venv .venv
63
+ source .venv/bin/activate
33
64
  pip install --upgrade pip
34
-
65
+
35
66
  # Install integrate module
36
67
  pip install integrate_module
37
-
38
- ### Using pip (from source, on Ubuntu)
39
68
 
40
- # Install python3 venv
69
+ ### Using pip + venv (from source, on Ubuntu)
70
+
71
+ # Install python3-venv
41
72
  sudo apt install python3-venv
42
73
 
43
- # Create virtual environment
44
- python3 -m venv ~/integrate
45
- source ~/integrate/bin/activate
74
+ # Create virtual environment in .venv/ inside the module root
75
+ cd path/to/integrate_module
76
+ python3 -m venv .venv
77
+ source .venv/bin/activate
46
78
  pip install --upgrade pip
47
79
 
48
- # Install integrate module
49
- cd path/to/integrate_module
80
+ # Install integrate module from source
50
81
  pip install -e .
51
82
 
83
+ ### Installing documentation dependencies
84
+
85
+ To also install the packages needed to build the Sphinx documentation, use the `docs` extra:
86
+
87
+ # With uv (from source)
88
+ uv sync --extra docs
89
+
90
+ # With uv pip (from source)
91
+ uv pip install -e ".[docs]"
92
+
93
+ # With pip (from source)
94
+ pip install -e ".[docs]"
95
+
52
96
  ### Using Conda + pip (from PyPI)
53
97
 
54
98
  Create a Conda environment (called integrate) and install the required modules:
@@ -130,7 +174,7 @@ The `develop` branch contains the current development code and may be updated fr
130
174
  An extra set of tests and examples are located in the ``experimental`` sub-branch `https://github.com/cultpenguin/integrate_module_experimental/ <https://github.com/cultpenguin/integrate_module_experimental/>`_.
131
175
  Please ask the developers for access to this branch if needed. To clone the main repository with the experimental branch, use:
132
176
 
133
- git clone --recurse-submodules git@github.com:cultpenguin/integrate_module.git
177
+ git clone --recurse-submodules git@github.com:AUProbGeo/integrate_module.git
134
178
 
135
179
  You may need to run the following command to update the submodules:
136
180
 
@@ -18,8 +18,9 @@ from integrate.integrate_rejection import create_shared_memory
18
18
  from integrate.integrate_rejection import compute_hypothesis_probability
19
19
 
20
20
  # Import other functions from main module
21
- from integrate.integrate import integrate_update_prior_attributes
21
+ from integrate.integrate import integrate_update_prior_attributes
22
22
  from integrate.integrate import integrate_posterior_stats
23
+ from integrate.integrate import prior_set
23
24
  from integrate.integrate import logl_T_est
24
25
  from integrate.integrate import lu_post_sample_logl
25
26
  from integrate.integrate import prior_data