fix merge conflicts

bismuthadams1 · Dec 12, 2024 · a16ffa4 · a16ffa4
1 parent d677639
commit a16ffa4
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 117 deletions.
diff --git a/naglmbis/models/__pycache__/base_model.cpython-311.pyc b/naglmbis/models/__pycache__/base_model.cpython-311.pyc
diff --git a/scripts/data/nagl_datasets/out.txt b/scripts/data/nagl_datasets/out.txt
diff --git a/scripts/data/nagl_datasets/slurm-22500079.out b/scripts/data/nagl_datasets/slurm-22500079.out
diff --git a/scripts/data/nagl_datasets/slurm-22500872.out b/scripts/data/nagl_datasets/slurm-22500872.out
diff --git a/scripts/data/nagl_datasets/slurm-22501266.out b/scripts/data/nagl_datasets/slurm-22501266.out
diff --git a/scripts/training/train_model.py b/scripts/training/train_model.py
@@ -87,11 +87,7 @@ def configure_model(
 def configure_data() -> DataConfig:
     return DataConfig(
         training=Dataset(
-<<<<<<< HEAD
-            sources=["../datasets/training.parquet"],
-=======
-            sources=["/home/localadmin/projects/nagl-mbis-release-for-training/nagl-mbis/scripts/datasets/testing.parquet"],
->>>>>>> 2469f10361fc24ac1bf64a5da1aa84db5e853498
+            sources=["./testing.parquet"],
             # The 'column' must match one of the label columns in the parquet
             # table that was create during stage 000.
             # The 'readout' column should correspond to one our or model readout
@@ -115,11 +111,7 @@ def configure_data() -> DataConfig:
             batch_size=250,
         ),
         validation=Dataset(
-<<<<<<< HEAD
-            sources=["../datasets/validation.parquet"],
-=======
-            sources=["/home/localadmin/projects/nagl-mbis-release-for-training/nagl-mbis/scripts/datasets/validation.parquet"],
->>>>>>> 2469f10361fc24ac1bf64a5da1aa84db5e853498
+            sources=["./validation.parquet"],
             targets=[
                 ReadoutTarget(
                     column="mbis-charges",
@@ -137,11 +129,7 @@ def configure_data() -> DataConfig:
             ],
         ),
         test=Dataset(
-<<<<<<< HEAD
-            sources=["../datasets/testing.parquet"],
-=======
-            sources=["/home/localadmin/projects/nagl-mbis-release-for-training/nagl-mbis/scripts/datasets/testing.parquet"],
->>>>>>> 2469f10361fc24ac1bf64a5da1aa84db5e853498
+            sources=["./testing.parquet"],
             targets=[
                 ReadoutTarget(
                     column="mbis-charges",