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.

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

GEOPY-74 #564

Merged
merged 44 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e1a9206
Point to mira_simpeg 0.19
domfournier May 5, 2023
0f8bba3
Fix defaults for sens threshold
domfournier May 8, 2023
62c4459
Fix for removal of unique locations
domfournier May 8, 2023
a34a5f2
Update for name changes
domfournier May 8, 2023
6f8f0f6
Update lock files
domfournier May 8, 2023
b4d5d11
Change function call, change defaults for PF.
domfournier May 9, 2023
4be67fb
Suppress warnings
domfournier May 16, 2023
f78dfa4
Revert to 0 threhsold for pf
domfournier May 16, 2023
c27bb1e
Change dependencies
domfournier May 16, 2023
bd4cbe2
Merge branch 'develop' into GEOPY-74
domfournier May 16, 2023
863568b
Update numbers in MVI test
domfournier May 17, 2023
8139cad
Update grav/mag tests
domfournier May 17, 2023
2e0fda5
Pass None instead of string forward_only
domfournier May 24, 2023
fbd4e4e
Change default sens_threshold to much smaller value
domfournier May 24, 2023
e81a2fc
Merge branch 'develop' into GEOPY-74
domfournier May 24, 2023
a3e1a85
Standardize threshold value
domfournier May 24, 2023
3e5df02
Remove custom threshold from run tests
domfournier May 25, 2023
660b6c1
More fixes for sens_wts_threshold. Update dc_test
domfournier May 25, 2023
41b9421
dc2d: Change reference to get_unique_locations
domfournier May 25, 2023
8cae561
Cleanup reference of 2D invesion to y-norm and y-alpha
domfournier May 25, 2023
9962eb1
Merge branch 'GEOPY-930' into GEOPY-74
domfournier May 31, 2023
c977caf
Name update
domfournier Jun 1, 2023
72361cc
Use Path in local main run
domfournier Jun 1, 2023
85c69e4
One more fix for Path
domfournier Jun 1, 2023
2368a8f
Update tipper test values
domfournier Jun 1, 2023
83b8fd9
Fix waveform name change
domfournier Jun 1, 2023
c07ab95
Fix waveform names
domfournier Jun 2, 2023
6ef1f5e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jun 2, 2023
32c47ad
Run black
domfournier Jun 2, 2023
0cba1f4
Merge branch 'GEOPY-74' of https://github.com/MiraGeoscience/geoapps …
domfournier Jun 2, 2023
c2c6cf6
Merge branch 'develop' into GEOPY-74
domfournier Jun 2, 2023
dad2ee5
Update locks
domfournier Jun 3, 2023
fdcecb0
Update unitests
domfournier Jun 5, 2023
6dfafb0
Updates for changes on ip2d
domfournier Jun 5, 2023
29f5c42
Move conductivity mapping into simulation build
domfournier Jun 5, 2023
a3e422c
Fix ip test
domfournier Jun 5, 2023
2156714
Use Path in joint test
domfournier Jun 5, 2023
4f6cfde
Try adding libhwloc
domfournier Jun 6, 2023
185673f
Fix pylint
domfournier Jun 6, 2023
381a240
Pin back libhwloc
domfournier Jun 6, 2023
2c10c24
Switch all alpha_x,y,z to length scales
domfournier Jun 7, 2023
f89398c
Cleanup _y component in dcip 2d
domfournier Jun 7, 2023
0a3cdb7
Fix param test
domfournier Jun 7, 2023
684f035
Merge branch 'develop' into GEOPY-74
domfournier Jun 7, 2023
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
2,867 changes: 1,441 additions & 1,426 deletions conda-py-3.10-lock.yml

Large diffs are not rendered by default.

2,873 changes: 1,444 additions & 1,429 deletions conda-py-3.9-lock.yml

Large diffs are not rendered by default.

114 changes: 57 additions & 57 deletions environments/conda-py-3.10-linux-64-dev.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 74ba695f5328c9d5049f4de58563d527c80771f1ea178a7a522697dc794f1c48
# input_hash: a8b80a6852040f6ca0ace176e3710887239d79a0c98b06e85e120ccf6b5eede7

channels:
- conda-forge
Expand All @@ -12,21 +12,21 @@ dependencies:
- font-ttf-source-code-pro=2.038=h77eed37_0
- font-ttf-ubuntu=0.83=hab24e00_0
- ld_impl_linux-64=2.40=h41732ed_0
- libgfortran5=12.2.0=h337968e_19
- libstdcxx-ng=12.2.0=h46fd767_19
- libgfortran5=13.1.0=h15d22d2_0
- libstdcxx-ng=13.1.0=hfd8a6a1_0
- poppler-data=0.4.12=hd8ed1ab_0
- python_abi=3.10=3_cp310
- tzdata=2023c=h71feb2d_0
- fonts-conda-forge=1=0
- libgfortran-ng=12.2.0=h69a702a_19
- libgfortran-ng=13.1.0=h69a702a_0
- fonts-conda-ecosystem=1=0
- _openmp_mutex=4.5=2_kmp_llvm
- libgcc-ng=12.2.0=h65d4601_19
- libgcc-ng=13.1.0=he5830b7_0
- aom=3.5.0=h27087fc_0
- bzip2=1.0.8=h7f98852_4
- c-ares=1.19.1=hd590300_0
- charls=2.4.2=h59595ed_0
- dav1d=1.2.0=hd590300_0
- dav1d=1.2.1=hd590300_0
- freexl=1.0.6=h166bdaf_1
- geos=3.11.2=hcb278e6_0
- gettext=0.21.1=h27087fc_0
Expand All @@ -53,14 +53,13 @@ dependencies:
- lz4-c=1.9.4=hcb278e6_0
- ncurses=6.3=h27087fc_1
- nspr=4.35=h27087fc_0
- openssl=3.1.0=hd590300_3
- openssl=3.1.1=hd590300_1
- pixman=0.40.0=h36c2ea0_0
- pthread-stubs=0.4=h36c2ea0_1001
- snappy=1.1.10=h9fff704_0
- tbb=2021.7.0=h924138e_0
- tzcode=2023c=h0b41bf4_0
- xorg-kbproto=1.0.7=h7f98852_1002
- xorg-libice=1.0.10=h7f98852_0
- xorg-libice=1.1.1=hd590300_0
- xorg-libxau=1.0.11=hd590300_0
- xorg-libxdmcp=1.1.3=h7f98852_0
- xorg-renderproto=0.11.1=h7f98852_1002
Expand All @@ -72,36 +71,37 @@ dependencies:
- zlib-ng=2.0.7=h0b41bf4_0
- expat=2.5.0=hcb278e6_1
- hdf4=4.2.15=h501b40f_6
- libavif=0.11.1=hff004cb_1
- libavif=0.11.1=h8182462_2
- libbrotlidec=1.0.9=h166bdaf_8
- libbrotlienc=1.0.9=h166bdaf_8
- libedit=3.1.20191231=he28a2e2_2
- libllvm14=14.0.6=hcd5def8_2
- libllvm14=14.0.6=hcd5def8_3
- libnghttp2=1.52.0=h61bc06f_0
- libpng=1.6.39=h753d276_0
- librttopo=1.1.0=h0d5128d_13
- libsqlite=3.42.0=h2797004_0
- libssh2=1.10.0=hf14f497_3
- libssh2=1.11.0=h0841786_0
- libxcb=1.13=h7f98852_1004
- libxml2=2.11.4=h0d562d8_0
- libxml2=2.10.4=hfdac1af_0
- libzip=1.9.2=hc929e4a_1
- pandoc=2.19.2=h32600fe_2
- pcre2=10.40=hc3806b6_0
- readline=8.2=h8228510_1
- tk=8.6.12=h27826a3_0
- xorg-libsm=1.2.3=hd9c2040_1000
- xorg-libsm=1.2.4=h7391055_0
- zeromq=4.3.4=h9c3ff4c_1
- zlib=1.2.13=h166bdaf_4
- zstd=1.5.2=h3eb15da_6
- blosc=1.21.4=h0f2a231_0
- boost-cpp=1.78.0=h6582d0a_3
- brotli-bin=1.0.9=h166bdaf_8
- c-blosc2=2.8.0=hf91038e_1
- c-blosc2=2.9.2=hb4ffafa_0
- freetype=2.12.1=hca18f0e_1
- krb5=1.20.1=h81ceb04_0
- libglib=2.76.3=hebfc3b9_0
- libhwloc=2.9.0=hd6dc26d_0
- libtiff=4.5.0=ha587672_6
- llvm-openmp=16.0.4=h4dfa4b3_0
- llvm-openmp=16.0.5=h4dfa4b3_0
- nss=3.89=he45b914_0
- python=3.10.11=he550d4f_0_cpython
- sqlite=3.42.0=h2c6b66d_0
Expand Down Expand Up @@ -130,7 +130,6 @@ dependencies:
- flit-core=3.9.0=pyhd8ed1ab_0
- fontconfig=2.14.2=h14ed4e7_0
- fsspec=2022.11.0=pyhd8ed1ab_0
- future=0.18.3=pyhd8ed1ab_0
- idna=3.4=pyhd8ed1ab_0
- iniconfig=2.0.0=pyhd8ed1ab_0
- ipython_genutils=0.2.0=py_1
Expand All @@ -139,15 +138,14 @@ dependencies:
- kiwisolver=1.4.4=py310hbf28c38_1
- lazy-object-proxy=1.9.0=py310h1fa729e_0
- lcms2=2.15=haa2dc70_1
- libcurl=8.1.1=h409715c_0
- libcurl=8.1.2=h409715c_0
- libkml=1.3.0=h37653c0_1015
- libpq=15.3=hbcd7760_1
- libpq=15.3=hbcd7760_0
- llvmlite=0.40.0=py310h1b8f574_0
- locket=1.0.0=pyhd8ed1ab_0
- markupsafe=2.1.2=py310h1fa729e_0
- markupsafe=2.1.3=py310h2372a71_0
- mccabe=0.7.0=pyhd8ed1ab_0
- mistune=2.0.5=pyhd8ed1ab_0
- mkl=2022.2.1=h84fe81f_16997
- msgpack-python=1.0.5=py310hdf3cbec_0
- munkres=1.1.4=pyh9f0ad1d_0
- nest-asyncio=1.5.6=pyhd8ed1ab_0
Expand All @@ -159,7 +157,7 @@ dependencies:
- pickleshare=0.7.5=py_1003
- pkgutil-resolve-name=1.3.10=pyhd8ed1ab_0
- pluggy=1.0.0=pyhd8ed1ab_5
- prometheus_client=0.16.0=pyhd8ed1ab_0
- prometheus_client=0.17.0=pyhd8ed1ab_0
- psutil=5.9.5=py310h1fa729e_0
- ptyprocess=0.7.0=pyhd3deb0d_0
- pure_eval=0.2.2=pyhd8ed1ab_0
Expand All @@ -172,13 +170,14 @@ dependencies:
- python-fastjsonschema=2.17.1=pyhd8ed1ab_0
- pytz=2023.3=pyhd8ed1ab_0
- pyyaml=6.0=py310h5764c6d_5
- pyzmq=25.0.2=py310h059b190_0
- pyzmq=25.1.0=py310h5bbb5d0_0
- send2trash=1.8.2=pyh41d4057_0
- setuptools=67.7.2=pyhd8ed1ab_0
- six=1.16.0=pyh6c4a22f_0
- sniffio=1.3.0=pyhd8ed1ab_0
- sortedcontainers=2.4.0=pyhd8ed1ab_0
- soupsieve=2.3.2.post1=pyhd8ed1ab_0
- tbb=2021.8.0=hf52228f_0
- tblib=1.7.0=pyhd8ed1ab_0
- tenacity=8.2.2=pyhd8ed1ab_0
- threadpoolctl=3.1.0=pyh8a188c0_0
Expand All @@ -188,7 +187,7 @@ dependencies:
- toolz=0.12.0=pyhd8ed1ab_0
- tornado=6.1=py310h5764c6d_3
- traitlets=5.9.0=pyhd8ed1ab_0
- typing_extensions=4.6.0=pyha770c72_0
- typing_extensions=4.6.3=pyha770c72_0
- unicodedata2=15.0.0=py310h5764c6d_0
- utm=0.7.0=pyhd8ed1ab_0
- webencodings=0.5.1=py_1
Expand All @@ -200,7 +199,7 @@ dependencies:
- zict=3.0.0=pyhd8ed1ab_0
- zipp=3.15.0=pyhd8ed1ab_0
- ansi2html=1.8.0=py310hff52083_1
- anyio=3.6.2=pyhd8ed1ab_0
- anyio=3.7.0=pyhd8ed1ab_1
- asttokens=2.2.1=pyhd8ed1ab_0
- backports.functools_lru_cache=1.6.4=pyhd8ed1ab_0
- beautifulsoup4=4.12.2=pyha770c72_0
Expand All @@ -213,8 +212,8 @@ dependencies:
- click-plugins=1.1.1=py_0
- cligj=0.7.2=pyhd8ed1ab_1
- comm=0.1.3=pyhd8ed1ab_0
- coverage=7.2.5=py310h2372a71_0
- curl=8.1.1=h409715c_0
- coverage=7.2.7=py310h2372a71_0
- curl=8.1.2=h409715c_0
- cytoolz=0.12.0=py310h5764c6d_1
- fonttools=4.39.4=py310h2372a71_0
- hdf5=1.14.0=nompi_hb72d44e_103
Expand All @@ -225,22 +224,22 @@ dependencies:
- jinja2=3.1.2=pyhd8ed1ab_1
- joblib=1.2.0=pyhd8ed1ab_0
- jupyterlab_pygments=0.2.2=pyhd8ed1ab_0
- libblas=3.9.0=16_linux64_mkl
- matplotlib-inline=0.1.6=pyhd8ed1ab_0
- mkl=2022.2.1=h84fe81f_16997
- munch=3.0.0=pyhd8ed1ab_0
- partd=1.4.0=pyhd8ed1ab_0
- pexpect=4.8.0=pyh1a96a4e_2
- pillow=9.4.0=py310h065c6d2_2
- pip=23.1.2=pyhd8ed1ab_0
- plotly=5.13.1=pyhd8ed1ab_0
- postgresql=15.3=hd458b1d_1
- postgresql=15.3=h814edd5_0
- proj=9.2.0=h8ffa02c_0
- python-dateutil=2.8.2=pyhd8ed1ab_0
- retrying=1.3.3=py_2
- terminado=0.17.1=pyh41d4057_0
- tinycss2=1.2.1=pyhd8ed1ab_0
- tqdm=4.65.0=pyhd8ed1ab_1
- typing-extensions=4.6.0=hd8ed1ab_0
- typing-extensions=4.6.3=hd8ed1ab_0
- urllib3=2.0.2=pyhd8ed1ab_0
- werkzeug=2.3.4=pyhd8ed1ab_0
- xerces-c=3.2.4=h8d71039_2
Expand All @@ -251,10 +250,9 @@ dependencies:
- geotiff=1.7.1=h480ec47_8
- jsonschema=4.17.3=pyhd8ed1ab_0
- kealib=1.5.1=h3845be2_3
- libcblas=3.9.0=16_linux64_mkl
- liblapack=3.9.0=16_linux64_mkl
- libnetcdf=4.9.2=nompi_h0f3d0bb_105
- libspatialite=5.0.1=hb46c372_26
- libblas=3.9.0=16_linux64_mkl
- libnetcdf=4.9.2=nompi_hdf9a29f_104
- libspatialite=5.0.1=h7d1ca68_25
- platformdirs=3.5.1=pyhd8ed1ab_0
- poppler=23.05.0=hd18248d_1
- pytest=7.3.1=pyhd8ed1ab_0
Expand All @@ -263,50 +261,51 @@ dependencies:
- tiledb=2.13.2=hd532e3d_0
- wcwidth=0.2.6=pyhd8ed1ab_0
- argon2-cffi=21.3.0=pyhd8ed1ab_0
- dash=2.9.3=pyhd8ed1ab_2
- dash=2.10.2=pyhd8ed1ab_0
- distributed=2022.10.0=pyhd8ed1ab_2
- jupyter_core=5.3.0=py310hff52083_0
- libgdal=3.6.4=h272c690_3
- numpy=1.23.5=py310h53a5b5f_0
- libcblas=3.9.0=16_linux64_mkl
- libgdal=3.6.4=hada8d5e_2
- liblapack=3.9.0=16_linux64_mkl
- pooch=1.7.0=pyha770c72_3
- prompt-toolkit=3.0.38=pyha770c72_0
- pylint=2.17.4=pyhd8ed1ab_0
- pytest-cov=4.0.0=pyhd8ed1ab_0
- contourpy=1.0.7=py310hdf3cbec_0
- pytest-cov=4.1.0=pyhd8ed1ab_0
- dash-daq=0.5.0=pyh9f0ad1d_1
- gdal=3.6.4=py310h52aca19_3
- jupyter_client=7.3.4=pyhd8ed1ab_0
- nbformat=5.9.0=pyhd8ed1ab_0
- numpy=1.23.5=py310h53a5b5f_0
- prompt_toolkit=3.0.38=hd8ed1ab_0
- contourpy=1.0.7=py310hdf3cbec_0
- gdal=3.6.4=py310hf0ca374_2
- h5py=3.8.0=nompi_py310ha66b2ad_101
- imagecodecs=2023.1.23=py310h241fb82_2
- imageio=2.28.1=pyh24c5eb1_0
- jupyter_client=7.3.4=pyhd8ed1ab_0
- nbformat=5.8.0=pyhd8ed1ab_0
- ipython=8.14.0=pyh41d4057_0
- nbclient=0.8.0=pyhd8ed1ab_0
- numba=0.57.0=py310h0f6aa51_0
- numcodecs=0.11.0=py310heca2aa9_1
- pandas=1.5.3=py310h9b08913_1
- prompt_toolkit=3.0.38=hd8ed1ab_0
- pywavelets=1.4.1=py310h0a54255_0
- scipy=1.10.1=py310ha4c1d20_3
- shapely=2.0.1=py310h056c13c_1
- vectormath=0.2.2=py_0
- discretize=0.7.4=py310hc4a4660_0
- empymod=2.2.1=pyhd8ed1ab_0
- discretize=0.8.3=py310h5a539fb_0
- empymod=2.2.2=pyhd8ed1ab_0
- fiona=1.9.3=py310ha325b7b_0
- ipython=8.13.2=pyh41d4057_0
- ipykernel=6.23.1=pyh210e3f2_0
- matplotlib-base=3.7.1=py310he60537e_0
- nbclient=0.8.0=pyhd8ed1ab_0
- properties=0.6.1=py_0
- nbconvert-core=7.4.0=pyhd8ed1ab_0
- pydiso=0.0.3=py310h1dd1467_4
- scikit-learn=1.2.2=py310h41b6a48_1
- scikit-learn=1.2.2=py310hf7d194e_2
- tifffile=2023.4.12=pyhd8ed1ab_0
- zarr=2.14.2=pyhd8ed1ab_0
- geoana=0.0.6=py_1
- ipykernel=6.23.1=pyh210e3f2_0
- nbconvert-core=7.4.0=pyhd8ed1ab_0
- pymatsolver=0.2.0=pyhd8ed1ab_0
- scikit-image=0.19.3=py310h769672d_2
- geoana=0.4.0=py310hbf28c38_1
- jupyter-dash=0.4.2=pyhd8ed1ab_1
- jupyter_server=1.23.6=pyhd8ed1ab_0
- nbconvert-pandoc=7.4.0=pyhd8ed1ab_0
- pymatsolver=0.2.0=pyhd8ed1ab_0
- scikit-image=0.19.3=py310h769672d_2
- nbconvert=7.4.0=pyhd8ed1ab_0
- notebook-shim=0.2.3=pyhd8ed1ab_0
- nbclassic=1.0.0=pyhb4ecaf3_1
Expand All @@ -315,11 +314,12 @@ dependencies:
- ipywidgets=7.7.5=pyhd8ed1ab_0
- ipyfilechooser=0.6.0=pyhd8ed1ab_0
- pip:
- geoh5py === 0.8.0a2
- simpeg-archive === 0.9.1.dev5
- geoh5py @ https://github.com/MiraGeoscience/geoh5py/archive/refs/heads/develop.zip
- properties === 0.6.1
- mira-omf === 3.0.0
- mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.15.1.dev10+geoapps.0.10.0.zip
- mira-simpeg @ https://github.com/MiraGeoscience/simpeg/archive/refs/heads/release/v0.19.0.dev1+geoapps.0.11.0.zip
- param-sweeps @ https://github.com/MiraGeoscience/param-sweeps/archive/refs/heads/develop.zip
- simpeg-archive === 0.9.1.dev5

variables:
KMP_WARNINGS: 0
Loading