Skip to content

Commit f1eb0b4

Browse files
mbkumarmbkumar
committed
Examples updated to remove graph_prefix
1 parent ec4162b commit f1eb0b4

26 files changed

+42
-44
lines changed

‎examples/1_Simple/just_a_quadratic.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env python3
22

33
import logging
4-
from simsopt.objectives.graph_functions import Identity
5-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
6-
from simsopt.solve.graph_serial import least_squares_serial_solve
4+
from simsopt.objectives.functions import Identity
5+
from simsopt.objectives.least_squares import LeastSquaresProblem
6+
from simsopt.solve.serial import least_squares_serial_solve
77

88
"""
99
Minimize f(x,y,z) = ((x-1)/1)^2 + ((y-2)/2)^2 + ((z-3)/3)^2.

‎examples/1_Simple/minimize_curve_length.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import numpy as np
44
from simsopt.geo.curverzfourier import CurveRZFourier
55
from simsopt.geo.curveobjectives import CurveLength
6-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
7-
from simsopt.solve.graph_serial import least_squares_serial_solve
6+
from simsopt.objectives.least_squares import LeastSquaresProblem
7+
from simsopt.solve.serial import least_squares_serial_solve
88

99
"""
1010
Minimize the length of a curve, holding the 0-frequency Fourier mode fixed.

‎examples/1_Simple/graph_surf_vol_area.py ‎examples/1_Simple/surf_vol_area.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#!/usr/bin/env python3
22

33
from simsopt.geo.surfacerzfourier import SurfaceRZFourier
4-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
5-
from simsopt.solve.graph_serial import least_squares_serial_solve
4+
from simsopt.objectives.least_squares import LeastSquaresProblem
5+
from simsopt.solve.serial import least_squares_serial_solve
66
"""
77
Optimize the minor radius and elongation of an axisymmetric torus to
88
obtain a desired volume and area using the graph method.
99
"""
1010

11-
print("Running 1_Simple/graph_surf_vol_area.py")
11+
print("Running 1_Simple/surf_vol_area.py")
1212
print("=======================================")
1313
desired_volume = 0.6
1414
desired_area = 8.0
@@ -54,5 +54,5 @@
5454
print(" -------------------------\n\n")
5555

5656

57-
print("End of 1_Simple/graph_surf_vol_area.py")
57+
print("End of 1_Simple/surf_vol_area.py")
5858
print("=======================================")

‎examples/2_Intermediate/QH_fixed_resolution.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from simsopt.util.mpi import MpiPartition
66
from simsopt.mhd.vmec import Vmec
77
from simsopt.mhd.vmec_diagnostics import QuasisymmetryRatioResidual
8-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
9-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
8+
from simsopt.objectives.least_squares import LeastSquaresProblem
9+
from simsopt.solve.mpi import least_squares_mpi_solve
1010

1111
"""
1212
Optimize a VMEC equilibrium for quasi-helical symmetry (M=1, N=1)

‎examples/2_Intermediate/QH_fixed_resolution_boozer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import os
44
from simsopt.util.mpi import MpiPartition
55
from simsopt.mhd import Vmec, Boozer, Quasisymmetry
6-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
7-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
6+
from simsopt.objectives.least_squares import LeastSquaresProblem
7+
from simsopt.solve.mpi import least_squares_mpi_solve
88

99
"""
1010
Optimize for quasi-helical symmetry (M=1, N=1) at a given radius.

‎examples/2_Intermediate/QSC.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import numpy as np
55
from qsc import Qsc
66

7-
from simsopt._core.graph_optimizable import Optimizable
7+
from simsopt._core.optimizable import Optimizable
88
from simsopt import LeastSquaresProblem, least_squares_serial_solve
99

1010
"""

‎examples/2_Intermediate/eliminate_magnetic_islands.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import numpy as np
55
from simsopt.util.mpi import MpiPartition, log
66
from simsopt.mhd.spec import Spec, Residue
7-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
8-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
7+
from simsopt.objectives.least_squares import LeastSquaresProblem
8+
from simsopt.solve.mpi import least_squares_mpi_solve
99
import os
1010

1111
"""

‎examples/2_Intermediate/resolution_increase.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from simsopt.util.mpi import MpiPartition, log
66
from simsopt.mhd.vmec import Vmec
77
from simsopt.mhd.vmec_diagnostics import QuasisymmetryRatioResidual
8-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
9-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
8+
from simsopt.objectives.least_squares import LeastSquaresProblem
9+
from simsopt.solve.mpi import least_squares_mpi_solve
1010

1111
"""
1212
This example shows how scripting can be used to increase the size

‎examples/2_Intermediate/resolution_increase_boozer.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import os
44
from simsopt.util.mpi import MpiPartition, log
55
from simsopt.mhd import Vmec, Boozer, Quasisymmetry
6-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
7-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
6+
from simsopt.objectives.least_squares import LeastSquaresProblem
7+
from simsopt.solve.mpi import least_squares_mpi_solve
88

99
"""
1010
This example shows how scripting can be used to increase the size

‎examples/3_Advanced/optimize_qs_and_islands_simultaneously.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from simsopt.util.mpi import log, MpiPartition
77
from simsopt.mhd import Vmec, Spec, Boozer, Quasisymmetry
88
from simsopt.mhd.spec import Residue
9-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
10-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
9+
from simsopt.objectives.least_squares import LeastSquaresProblem
10+
from simsopt.solve.mpi import least_squares_mpi_solve
1111

1212
"""
1313
In this example, we simultaneously optimize for quasisymmetry and

‎examples/README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,8 @@ Minimize f(x,y,z) = ((x-1)/1)^2 + ((y-2)/2)^2 + ((z-3)/3)^2.
1414
Example file for transparently logging both MPI and serial jobs
1515
### minimize_curve_length
1616
Minimize the length of a curve, holding the 0-frequency Fourier mode fixed resulting in a circle.
17-
### surface_volume_and_area
17+
### surf_vol_area
1818
Optimize the minor radius and elongation of an axisymmetric torus to obtain a desired volume and area.
19-
### graph_surf_vol_area
20-
Optimize the minor radius and elongation of an axisymmetric torus to obtain a desired volume and area using the graph optimizable objects.
2119

2220
## 2_Intermediate
2321

‎examples/run_serial_examples

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
set -ex
66

77
./1_Simple/just_a_quadratic.py
8-
./1_Simple/graph_surf_vol_area.py
8+
./1_Simple/surf_vol_area.py
99
./1_Simple/minimize_curve_length.py
1010
./1_Simple/tracing_fieldline.py
1111
./1_Simple/tracing_particle.py

‎examples/stellarator_benchmarks/1DOF_circularCrossSection_varyAxis_targetIota.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import numpy as np
66

77
from simsopt.mhd import Vmec
8-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
8+
from simsopt.objectives.least_squares import LeastSquaresProblem
99
from simsopt.util.mpi import MpiPartition, log
10-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
10+
from simsopt.solve.mpi import least_squares_mpi_solve
1111
from simsopt.geo.surfacegarabedian import SurfaceGarabedian
1212

1313
"""

‎examples/stellarator_benchmarks/1DOF_circularCrossSection_varyAxis_targetIota_spec.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
from simsopt.util.mpi import MpiPartition, log
88
from simsopt.mhd import Spec
9-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
10-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
9+
from simsopt.objectives.least_squares import LeastSquaresProblem
10+
from simsopt.solve.mpi import least_squares_mpi_solve
1111
from simsopt.geo.surfacegarabedian import SurfaceGarabedian
1212

1313
"""

‎examples/stellarator_benchmarks/1DOF_circularCrossSection_varyR0_targetVolume.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import numpy as np
44
from mpi4py import MPI
55

6-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
6+
from simsopt.objectives.least_squares import LeastSquaresProblem
77
from simsopt.mhd import Vmec
88
from simsopt.util.mpi import MpiPartition, log
9-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
9+
from simsopt.solve.mpi import least_squares_mpi_solve
1010

1111
"""
1212
This script implements the "1DOF_circularCrossSection_varyR0_targetVolume"

‎examples/stellarator_benchmarks/1DOF_circularCrossSection_varyR0_targetVolume_spec.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
from simsopt.mhd import Spec
77
from simsopt.geo.surfacerzfourier import SurfaceRZFourier
8-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
9-
from simsopt.solve.graph_serial import least_squares_serial_solve
8+
from simsopt.objectives.least_squares import LeastSquaresProblem
9+
from simsopt.solve.serial import least_squares_serial_solve
1010

1111
"""
1212
This script implements the "1DOF_circularCrossSection_varyR0_targetVolume"

‎examples/stellarator_benchmarks/2DOF_circularCrossSection_varyAxis_targetIotaAndQuasisymmetry.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env python
22

33
from simsopt.mhd import Vmec, Boozer, Quasisymmetry
4-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
5-
from simsopt.solve.graph_serial import least_squares_serial_solve
4+
from simsopt.objectives.least_squares import LeastSquaresProblem
5+
from simsopt.solve.serial import least_squares_serial_solve
66
import os
77

88
"""

‎examples/stellarator_benchmarks/2DOF_specOnly_targetIotaAndVolume.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import numpy as np
55

66
from simsopt.mhd import Spec
7-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
8-
from simsopt.solve.graph_serial import least_squares_serial_solve
7+
from simsopt.objectives.least_squares import LeastSquaresProblem
8+
from simsopt.solve.serial import least_squares_serial_solve
99
import os
1010

1111
"""

‎examples/stellarator_benchmarks/2DOF_vmecAndSpec.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
from simsopt.util.mpi import MpiPartition, log
77
from simsopt.mhd import Vmec, Spec
8-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
9-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
8+
from simsopt.objectives.least_squares import LeastSquaresProblem
9+
from simsopt.solve.mpi import least_squares_mpi_solve
1010
import os
1111

1212
"""

‎examples/stellarator_benchmarks/2DOF_vmecOnly_targetIotaAndVolume.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import numpy as np
44

55
from simsopt.mhd import Vmec
6-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
6+
from simsopt.objectives.least_squares import LeastSquaresProblem
77
from simsopt.util.mpi import MpiPartition, log
8-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
8+
from simsopt.solve.mpi import least_squares_mpi_solve
99
import os
1010

1111
"""

‎examples/stellarator_benchmarks/7dof.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import os
44
from simsopt.util.mpi import MpiPartition, log
55
from simsopt.mhd import Vmec, Boozer, Quasisymmetry
6-
from simsopt.objectives.graph_least_squares import LeastSquaresProblem
7-
from simsopt.solve.graph_mpi import least_squares_mpi_solve
6+
from simsopt.objectives.least_squares import LeastSquaresProblem
7+
from simsopt.solve.mpi import least_squares_mpi_solve
88
from simsopt.geo.surfacegarabedian import SurfaceGarabedian
99

1010
"""

‎src/simsopt/_core/graph_optimizable.py ‎src/simsopt/_core/optimizable.py

File renamed without changes.

‎src/simsopt/objectives/graph_functions.py ‎src/simsopt/objectives/functions.py

File renamed without changes.

‎src/simsopt/objectives/graph_least_squares.py ‎src/simsopt/objectives/least_squares.py

File renamed without changes.

‎src/simsopt/solve/graph_mpi.py ‎src/simsopt/solve/mpi.py

File renamed without changes.

‎src/simsopt/solve/graph_serial.py ‎src/simsopt/solve/serial.py

File renamed without changes.

0 commit comments

Comments
 (0)