metafold 0.14.dev0__tar.gz → 0.15.dev0__tar.gz

{metafold-0.14.dev0 → metafold-0.15.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.14.dev0
+Version: 0.15.dev0
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.14.dev0 → metafold-0.15.dev0}/metafold/simulation/compression_simulation.py

@@ -474,6 +474,8 @@ class CompressionSimulation:
     # experiment variants sampled later match the base simulation's density.
     sample_spacing: Optional[float] = None
 
+    use_experimental_solver: bool = False
+
     def __init__(
         self,
         parts: list[ExperimentPart],
@@ -503,6 +505,7 @@ class CompressionSimulation:
         project_name: str = "",
         use_legacy_results_format: bool = False,
         write_ups: bool = True,
+        use_experimental_solver: bool = False,
     ):
         if not output_path:
             if project_name:
@@ -542,6 +545,8 @@ class CompressionSimulation:
         else:
             self.client = client
 
+        self.use_experimental_solver = use_experimental_solver
+
     def _write_ups(self, content: str, filename: str) -> None:
         if self.write_ups and self.out_dir is not None:
             (self.out_dir / filename).write_text(content)
@@ -1370,8 +1375,12 @@ class CompressionSimulation:
         # Only parts that have a volume go into the compress assets list
         parts_with_volume = [p for p in part_infos if p.volume_filename]
 
+        job_type = "sim/custom"
+        if self.use_experimental_solver:
+            job_type = "sim/custom-gpu"
+
         self.workflow_jobs[compress_job_name] = {
-            "type": "sim/custom",
+            "type": job_type,
         }
 
         # compress.volume is a list of volume asset filenames in part order
@@ -1505,6 +1514,11 @@ class CompressionSimulation:
                     for row in piston_info.part.velocity
                 ]
             )
+            if piston_info.part.force_limit:
+                # Switch to using piston particle positions to determine displacement
+                self.workflow_params[f"{job_name_base}.piston_position"] = (
+                    f"/material{piston_info.material_index}/position"
+                )
 
     def _add_to_workflow_stress_strain(self, part_infos: list[PartInfo]):
         # One stress-strain job per deformable part, each normalizing the shared

{metafold-0.14.dev0 → metafold-0.15.dev0}/metafold/simulation/run_experiment.py

@@ -329,6 +329,12 @@ def _build_simulation_parameters(sim_config: dict) -> SimulationParameters:
     return params
 
 
+def num_simulations(config: dict) -> int:
+    """Count number of simulation variations to be generated by a given configuration.
+    """
+    return len(_build_varying(config.get("varying", [])))
+
+
 def run_experiment(
     config: dict,
     output_path: str = "",
@@ -373,6 +379,8 @@ def run_experiment(
     varying = _build_varying(config.get("varying", []))
     sim_params = _build_simulation_parameters(config.get("simulation", {}))
 
+    use_experimental_solver = config.get("use_experimental_solver", False)
+
     sim_kwargs: dict = dict(
         parts=parts,
         simulation_name=project_name,
@@ -381,6 +389,7 @@ def run_experiment(
         simulation_parameters=sim_params,
         project_id=project_id,
         create_project_if_needed=not bool(project_id),
+        use_experimental_solver=use_experimental_solver,
     )
     # Only pass project_name when we have to create a project. When a
     # project_id is supplied the project already exists, and passing the name

{metafold-0.14.dev0 → metafold-0.15.dev0}/metafold.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: metafold
-Version: 0.14.dev0
+Version: 0.15.dev0
 Summary: Metafold SDK for Python
 Author-email: Metafold 3D <info@metafold3d.com>
 License: Copyright 2024 Metafold 3D

{metafold-0.14.dev0 → metafold-0.15.dev0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.14.dev0"
+version = "0.15.dev0"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]