From c5e3ce53de8dcd1e6dcac3a6ae5d4f6c39a2acbe Mon Sep 17 00:00:00 2001
From: swittl <simon.wittl@th-deg.de>
Date: Mon, 11 Nov 2024 13:57:39 +0100
Subject: [PATCH] name changes
---
pyproject.toml | 2 +-
scripts/02_generate_atlas.py | 6 +++---
scripts/04_mapping.py | 6 +++---
scripts/05_data_augmentation.py | 8 ++++----
scripts/06_generate_dataset.py | 2 +-
src/cyxtrax/io/generate_atlas.py | 4 ++--
src/cyxtrax/io/load_maps.py | 2 +-
src/cyxtrax/util/datasets/pipeline.py | 6 +++---
src/cyxtrax/util/visualisation/gif.py | 2 +-
uv.lock | 4 ++--
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/pyproject.toml b/pyproject.toml
index 91b0305..7ad038c 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 c639402..d3417c6 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 175ca9d..937ca25 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 8174174..2212e22 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 224df5e..edd7d0f 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 6b15410..b8c6607 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 f0053a9..3364018 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 fa9f0ef..08a0ba4 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 77c59c7..25662c7 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 7c477bf..05ae03d 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" },
--
GitLab