Merge pull request #14 from xsuite/release/v0.1.5

Release 0.1.5

Author: freddieknets

examples/running/lossmap.py

@@ -27,12 +27,15 @@
 
 
 # Run xboinc
-cmd = subprocess.run(['uname', '-ms'], stdout=subprocess.PIPE)
-architecture = cmd.stdout.decode('UTF-8').strip().lower().replace(' ','-')
-exec_file = list(Path.cwd().glob(f'xboinc_{xb.app_version}-{architecture}'))
-if len(exec_file)==0 or not exec_file[0].exists():
+cmd    = subprocess.run(['uname', '-m'], stdout=subprocess.PIPE)
+arch   = cmd.stdout.decode('UTF-8').strip().lower()
+cmd    = subprocess.run(['uname', '-s'], stdout=subprocess.PIPE)
+thisos = cmd.stdout.decode('UTF-8').strip().lower()
+exec_files = list(Path.cwd().glob(f'xboinc_{xb.app_version}-*'))
+exec_files = [f for f in exec_files if arch in str(f) and thisos in str(f)]
+if len(exec_files)==0 or not exec_files[0].exists():
     raise ValueError("No executable found")
-exec_file = exec_file[0]
+exec_file = exec_files[0]
 cmd = subprocess.run(exec_file)
 if cmd.returncode != 0:
     raise RuntimeError(f"Tracking failed.")

examples/running/simple_line.py

@@ -1,3 +1,8 @@
+# copyright ############################### #
+# This file is part of the Xboinc Package.  #
+# Copyright (c) CERN, 2023.                 #
+########################################### #
+
 import subprocess
 from pathlib import Path
 import numpy as np
@@ -17,12 +22,15 @@
 
 
 # Run xboinc
-cmd = subprocess.run(['uname', '-ms'], stdout=subprocess.PIPE)
-architecture = cmd.stdout.decode('UTF-8').strip().lower().replace(' ','-')
-exec_file = list(Path.cwd().glob(f'xboinc_{xb.app_version}-{architecture}'))
-if len(exec_file)==0 or not exec_file[0].exists():
+cmd    = subprocess.run(['uname', '-m'], stdout=subprocess.PIPE)
+arch   = cmd.stdout.decode('UTF-8').strip().lower()
+cmd    = subprocess.run(['uname', '-s'], stdout=subprocess.PIPE)
+thisos = cmd.stdout.decode('UTF-8').strip().lower()
+exec_files = list(Path.cwd().glob(f'xboinc_{xb.app_version}-*'))
+exec_files = [f for f in exec_files if arch in str(f) and thisos in str(f)]
+if len(exec_files)==0 or not exec_files[0].exists():
     raise ValueError("No executable found")
-exec_file = exec_file[0]
+exec_file = exec_files[0]
 cmd = subprocess.run(exec_file)
 if cmd.returncode != 0:
     raise RuntimeError(f"Tracking failed.")

examples/running/xboinc_0.1-arm64-apple-darwin

@@ -23,10 +23,23 @@
 
 studyname = "example_study"
 
-with xb.SubmitJobs(user=user, study=studyname) as job:
+
+# Submission can be done in a context, where the submission
+# itself is triggered when exiting the context
+with xb.SubmitJobs(user=user, study=studyname) as submitter:
     for i in range(int(num_particles/particles_per_sub)):
         particles = xp.Particles(x=np.random.normal(0, 0.0001, particles_per_sub),
                                  y=np.random.normal(0, 0.0001, particles_per_sub))
-        job.add(job_name=f'{studyname}_{i}', num_turns=num_turns, line=line, particles=particles,
+        submitter.add(job_name=f'{studyname}_{i}', num_turns=num_turns, line=line, particles=particles,
                 checkpoint_every=100)
 
+
+# Or by manually triggering the submission
+submitter = xb.SubmitJobs(user=user, study=studyname)
+for i in range(int(num_particles/particles_per_sub)):
+    particles = xp.Particles(x=np.random.normal(0, 0.0001, particles_per_sub),
+                             y=np.random.normal(0, 0.0001, particles_per_sub))
+    submitter.add(job_name=f'{studyname}_{i}', num_turns=num_turns, line=line, particles=particles,
+                  checkpoint_every=100)
+submitter.submit()
+