diff --git a/pyproject.toml b/pyproject.toml index 91b03059a663904a9640f16aaa0063e2b555978e..7ad038c006e314c3385c575bf152be9415194bc0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = [ ] requires-python = ">=3.10" dependencies = [ - "artistlib", + "artistlib ; sys_platform == 'windows'", "dm-pix>=0.4.3", "h5py>=3.12.1", "jax>=0.4.35 ; sys_platform == 'windows'", diff --git a/scripts/02_generate_atlas.py b/scripts/02_generate_atlas.py index c6394023741d8f3527bc10f1c65885ac64e2fc09..d3417c626bb60df82a64937dd7693b7311e549a9 100644 --- a/scripts/02_generate_atlas.py +++ b/scripts/02_generate_atlas.py @@ -1,6 +1,6 @@ -from CyXTraX.io import record_atlas -from CyXTraX.simulation import CylindricalProjection, load_mesh -from CyXTraX.data import olaf_mesh +from cyxtrax.io import record_atlas +from cyxtrax.simulation import CylindricalProjection, load_mesh +from cyxtrax.data import olaf_mesh from pathlib import Path diff --git a/scripts/04_mapping.py b/scripts/04_mapping.py index 175ca9d2c5bd368bd5edcf00870d35c70bf21f97..937ca25ecb73cfbabb80f6f516d312c53647ee00 100644 --- a/scripts/04_mapping.py +++ b/scripts/04_mapping.py @@ -1,6 +1,6 @@ -from CyXTraX.simulation import CylindricalProjection, load_mesh, SAVEMODES, utility -from CyXTraX.io import load_atlas -from CyXTraX.mapping import map_geometry_2_projection, map_source_2_cylinder +from cyxtrax.simulation import CylindricalProjection, load_mesh, SAVEMODES, utility +from cyxtrax.io import load_atlas +from cyxtrax.mapping import map_geometry_2_projection, map_source_2_cylinder from pathlib import Path from jax import numpy as jnp from jax.scipy.spatial.transform import Rotation diff --git a/scripts/05_data_augmentation.py b/scripts/05_data_augmentation.py index 81741745d9b7b6968dd38abead5756d52a34ef53..2212e22fdab47b6c1214d84282873c289cdcc1a8 100644 --- a/scripts/05_data_augmentation.py +++ b/scripts/05_data_augmentation.py @@ -1,7 +1,7 @@ -from CyXTraX.io import load_atlas -from CyXTraX.simulation.model import add_white_noise, add_gaussian_blur, add_material -from CyXTraX.util.visualisation import save_map_plot_with_index -from CyXTraX.util.datasets import merge_atlases +from cyxtrax.io import load_atlas +from cyxtrax.simulation.model import add_white_noise, add_gaussian_blur, add_material +from cyxtrax.util.visualisation import save_map_plot_with_index +from cyxtrax.util.datasets import merge_atlases from pathlib import Path from jax import random diff --git a/scripts/06_generate_dataset.py b/scripts/06_generate_dataset.py index 224df5e0680195688360a51acd1f3810b59a5036..edd7d0fe8869b371bdf5b0df43845d9202653612 100644 --- a/scripts/06_generate_dataset.py +++ b/scripts/06_generate_dataset.py @@ -1,4 +1,4 @@ -from CyXTraX.util.datasets import generate_atlas_from_folder +from cyxtrax.util.datasets import generate_atlas_from_folder from pathlib import Path from jax import random diff --git a/src/cyxtrax/io/generate_atlas.py b/src/cyxtrax/io/generate_atlas.py index 6b15410b4a49e0228debb122d6224b5343ce7ee8..b8c6607600b2b6e6734ce1baa192b85149bb09d5 100644 --- a/src/cyxtrax/io/generate_atlas.py +++ b/src/cyxtrax/io/generate_atlas.py @@ -1,7 +1,7 @@ import numpy as np import h5py -from CyXTraX.simulation.artist_bridge import CylindricalProjection -from CyXTraX.common.mesh_object import MeshObject +from cyxtrax.simulation.artist_bridge import CylindricalProjection +from cyxtrax.common.mesh_object import MeshObject from pathlib import Path import json diff --git a/src/cyxtrax/io/load_maps.py b/src/cyxtrax/io/load_maps.py index f0053a9244aeb585c69cbb7af81546a96c3e5f04..3364018fdd0fd5d5b22ea6a8c1f656c8d0caffa6 100644 --- a/src/cyxtrax/io/load_maps.py +++ b/src/cyxtrax/io/load_maps.py @@ -1,6 +1,6 @@ import h5py from jax import numpy as jnp -from CyXTraX.common.mesh_object import MeshObject +from cyxtrax.common.mesh_object import MeshObject import json from pathlib import Path diff --git a/src/cyxtrax/util/datasets/pipeline.py b/src/cyxtrax/util/datasets/pipeline.py index fa9f0ef68ec768d5f093136a6b1808f3c0adc027..08a0ba40e69a7ab2ef2b9ca99f20fcf794a1b476 100644 --- a/src/cyxtrax/util/datasets/pipeline.py +++ b/src/cyxtrax/util/datasets/pipeline.py @@ -1,7 +1,7 @@ from pathlib import Path -from CyXTraX.simulation import CylindricalProjection, load_mesh -from CyXTraX.common import MeshObject -from CyXTraX.io import record_atlas +from cyxtrax.simulation import CylindricalProjection, load_mesh +from cyxtrax.common import MeshObject +from cyxtrax.io import record_atlas from jax import random, numpy as jnp from jax.scipy.spatial.transform import Rotation diff --git a/src/cyxtrax/util/visualisation/gif.py b/src/cyxtrax/util/visualisation/gif.py index 77c59c706fd0953ca0bc556f0d3f4e0bd3e2d66b..25662c7d07a63f855c3e7e9734ddf17e0ca5ce2d 100644 --- a/src/cyxtrax/util/visualisation/gif.py +++ b/src/cyxtrax/util/visualisation/gif.py @@ -1,4 +1,4 @@ -from CyXTraX.io import load_atlas +from cyxtrax.io import load_atlas from pathlib import Path from PIL import Image diff --git a/uv.lock b/uv.lock index 7c477bf8a8b814d9274d5ed12f26652a6292caf6..05ae03d7f242ccd26ad8d32bebea9384e277b46c 100644 --- a/uv.lock +++ b/uv.lock @@ -123,7 +123,7 @@ name = "cyxtrax" version = "0.1.0" source = { editable = "." } dependencies = [ - { name = "artistlib" }, + { name = "artistlib", marker = "sys_platform == 'windows'" }, { name = "dm-pix" }, { name = "h5py" }, { name = "jax", marker = "sys_platform == 'linux' or sys_platform == 'windows'" }, @@ -137,7 +137,7 @@ dependencies = [ [package.metadata] requires-dist = [ - { name = "artistlib", git = "https://github.com/wittlsn/aRTist-PythonLib" }, + { name = "artistlib", marker = "sys_platform == 'windows'", git = "https://github.com/wittlsn/aRTist-PythonLib" }, { name = "dm-pix", specifier = ">=0.4.3" }, { name = "h5py", specifier = ">=3.12.1" }, { name = "jax", marker = "sys_platform == 'windows'", specifier = ">=0.4.35" },