Add "using GLMakie" to all examples

yijiangh · yijiangh · commit f6d9bfdfa1e1 · 2023-01-08T11:23:02.000+01:00
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ pkg"add TopOpt"
 To additionally load the visualization submodule of `TopOpt`, you will need to install `GLMakie.jl` using:
 
 ```julia
-pkg"add GLMakie"
+pkg"add Makie, GLMakie"
 ```
 
 To load the package, use:
@@ -30,7 +30,7 @@ using TopOpt
 and to optionally load the visualization sub-module as part of `TopOpt`, use:
 
 ```julia
-using TopOpt, GLMakie
+using TopOpt, Makie, GLMakie
 ```
 
 ![gif1](https://user-images.githubusercontent.com/19524993/138464511-2685f3fe-e7c5-482e-8b06-43ab0fb82990.gif)
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -22,7 +22,7 @@ pkg"add TopOpt"
 To additionally load the visualization submodule of `TopOpt`, you will need to install `Makie.jl` using:
 
 ```julia
-pkg"add Makie"
+pkg"add Makie, GLMakie"
 ```
 
 To load the package, use:
@@ -34,5 +34,5 @@ using TopOpt
 and to optionally load the visualization sub-module as part of `TopOpt`, use:
 
 ```julia
-using TopOpt, Makie
+using TopOpt, Makie, GLMakie
 ```
diff --git a/docs/src/literate/beso.jl b/docs/src/literate/beso.jl
@@ -33,8 +33,9 @@ x0 = ones(length(solver.vars))
 result = beso(x0)
 
 # ### (Optional) Visualize the result using Makie.jl
-# Need to run `using Pkg; Pkg.add(Makie)` first
+# Need to run `using Pkg; Pkg.add(["Makie", "GLMakie"])` first
 # ```julia
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 # fig = visualize(problem; topology = result.topology)
 # Makie.display(fig)
diff --git a/docs/src/literate/csimp.jl b/docs/src/literate/csimp.jl
@@ -74,8 +74,9 @@ end
 @show constr(x)
 
 # ### (Optional) Visualize the result using Makie.jl
-# Need to run `using Pkg; Pkg.add(Makie)` first
+# Need to run `using Pkg; Pkg.add(["Makie", "GLMakie"])` first
 # ```julia
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 # fig = visualize(problem; topology = x, default_exagg_scale = 0.07,
 #     scale_range = 10.0, vector_linewidth = 3, vector_arrowsize = 0.5,
diff --git a/docs/src/literate/geso.jl b/docs/src/literate/geso.jl
@@ -33,8 +33,9 @@ x0 = ones(length(solver.vars))
 result = geso(x0)
 
 # ### (Optional) Visualize the result using Makie.jl
-# Need to run `using Pkg; Pkg.add(Makie)` first
+# Need to run `using Pkg; Pkg.add(["Makie", "GLMakie"])` first
 # ```julia
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 # fig = visualize(problem; topology = result.topology)
 # Makie.display(fig)
diff --git a/docs/src/literate/global_stress.jl b/docs/src/literate/global_stress.jl
@@ -68,8 +68,9 @@ r = optimize(model, alg, x0; options)
 @show constr(r.minimizer)
 
 # ### (Optional) Visualize the result using Makie.jl
-# Need to run `using Pkg; Pkg.add(Makie)` first
+# Need to run `using Pkg; Pkg.add(["Makie", "GLMakie"])` first
 # ```julia
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 # fig = visualize(problem; topology = r.minimizer)
 # Makie.display(fig)
diff --git a/docs/src/literate/local_stress.jl b/docs/src/literate/local_stress.jl
@@ -47,9 +47,9 @@ maximum(stress(filter(PseudoDensities(x0))))
 maximum(stress(filter(PseudoDensities(x))))
 
 # ### (Optional) Visualize the result using Makie.jl
-# Need to run `using Pkg; Pkg.add(Makie)` first
+# Need to run `using Pkg; Pkg.add(["Makie", "GLMakie"])` first
 # ```julia
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 # fig = visualize(
 #    problem; topology = r.minimizer, default_exagg_scale = 0.07,
diff --git a/docs/src/literate/simp.jl b/docs/src/literate/simp.jl
@@ -57,8 +57,9 @@ r = optimize(model, alg, x0; options)
 @show obj(r.minimizer)
 
 # ### (Optional) Visualize the result using Makie.jl
-# Need to run `using Pkg; Pkg.add(Makie)` first
+# Need to run `using Pkg; Pkg.add(["Makie", "GLMakie"])` first
 # ```julia
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 # fig = visualize(
 #     problem; topology = r.minimizer,
diff --git a/test/examples/mixed_integer_truss/truss_compliance_2d1.jl b/test/examples/mixed_integer_truss/truss_compliance_2d1.jl
@@ -1,5 +1,5 @@
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TrussTopOptProblems.TrussVisualization: visualize
 
 Nonconvex.@load Juniper
diff --git a/test/examples/neural.jl b/test/examples/neural.jl
@@ -1,5 +1,4 @@
 using TopOpt, Zygote, ChainRulesCore
-# using Makie
 Nonconvex.@load Ipopt
 
 E = 1.0 # Young’s modulus
diff --git a/test/wcsmo14/demos/continuum/cont_compliance1.jl b/test/wcsmo14/demos/continuum/cont_compliance1.jl
@@ -1,7 +1,7 @@
 module ContComplianceDemo1
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 E = 1.0 # Young’s modulus
diff --git a/test/wcsmo14/demos/continuum/cont_compliance2.jl b/test/wcsmo14/demos/continuum/cont_compliance2.jl
@@ -1,7 +1,7 @@
 module ContComplianceDemo2
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 E = 1.0 # Young’s modulus
diff --git a/test/wcsmo14/demos/continuum/cont_compliance3_3D.ipynb b/test/wcsmo14/demos/continuum/cont_compliance3_3D.ipynb
@@ -7,7 +7,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "using Makie, TopOpt, LinearAlgebra, StatsFuns\n",
+    "using Makie, GLMakie, TopOpt, LinearAlgebra, StatsFuns\n",
     "using TopOpt.TopOptProblems.Visualization: visualize"
    ]
   },
diff --git a/test/wcsmo14/demos/continuum/cont_stress.jl b/test/wcsmo14/demos/continuum/cont_stress.jl
@@ -1,7 +1,7 @@
 module ContStressDemo
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 E = 1.0 # Young’s modulus
diff --git a/test/wcsmo14/demos/truss/truss_compliance_2d1.jl b/test/wcsmo14/demos/truss/truss_compliance_2d1.jl
@@ -1,7 +1,7 @@
 module TrussComplianceDemo2D1
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TrussTopOptProblems.TrussVisualization: visualize
 
 # 2D
diff --git a/test/wcsmo14/demos/truss/truss_compliance_2d2.jl b/test/wcsmo14/demos/truss/truss_compliance_2d2.jl
@@ -1,7 +1,7 @@
 module TrussComplianceDemo2D2
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TrussTopOptProblems.TrussVisualization: visualize
 
 # 2D
diff --git a/test/wcsmo14/demos/truss/truss_compliance_3d1.jl b/test/wcsmo14/demos/truss/truss_compliance_3d1.jl
@@ -1,7 +1,7 @@
 module TrussComplianceDemo3D1
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TrussTopOptProblems.TrussVisualization: visualize
 
 # 3D
diff --git a/test/wcsmo14/demos/truss/truss_compliance_3d2.jl b/test/wcsmo14/demos/truss/truss_compliance_3d2.jl
@@ -1,7 +1,7 @@
 module TrussComplianceDemo3D2
 
 using TopOpt, LinearAlgebra, StatsFuns
-# using Makie
+# using Makie, GLMakie
 # using TopOpt.TrussTopOptProblems.TrussVisualization: visualize
 
 # 3D
diff --git a/test/wcsmo14/jl_benchmarks/compare_neo99_2D.jl b/test/wcsmo14/jl_benchmarks/compare_neo99_2D.jl
@@ -1,5 +1,5 @@
 using TopOpt
-# import Makie
+# import Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 using TimerOutputs
diff --git a/test/wcsmo14/jl_benchmarks/compare_polytop.jl b/test/wcsmo14/jl_benchmarks/compare_polytop.jl
@@ -1,5 +1,5 @@
 using TopOpt
-# import Makie
+# import Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 using TimerOutputs
diff --git a/test/wcsmo14/jl_benchmarks/compare_top3d.jl b/test/wcsmo14/jl_benchmarks/compare_top3d.jl
@@ -1,6 +1,6 @@
 using TopOpt
 Nonconvex.@load Ipopt
-# import Makie
+# import Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 using Suppressor
diff --git a/test/wcsmo14/jl_benchmarks/compare_top3d125.jl b/test/wcsmo14/jl_benchmarks/compare_top3d125.jl
@@ -1,5 +1,5 @@
 using TopOpt
-# import Makie
+# import Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 using Suppressor
 
diff --git a/test/wcsmo14/jl_benchmarks/compare_topopt_py.jl b/test/wcsmo14/jl_benchmarks/compare_topopt_py.jl
@@ -1,5 +1,5 @@
 using TopOpt
-# import Makie
+# import Makie, GLMakie
 # using TopOpt.TopOptProblems.Visualization: visualize
 
 using TimerOutputs

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using TopOpt, Zygote, ChainRulesCore`
`2`		`-# using Makie`
`3`	`2`	`Nonconvex.@load Ipopt`
`4`	`3`
`5`	`4`	`E = 1.0 # Young’s modulus`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`"metadata": {},`
`8`	`8`	`"outputs": [],`
`9`	`9`	`"source": [`
`10`		`- "using Makie, TopOpt, LinearAlgebra, StatsFuns\n",`
	`10`	`+ "using Makie, GLMakie, TopOpt, LinearAlgebra, StatsFuns\n",`
`11`	`11`	`"using TopOpt.TopOptProblems.Visualization: visualize"`
`12`	`12`	`]`
`13`	`13`	`},`