[New example] Add nls-mb example #838

xusuyong · 2024-04-08T03:52:53Z

PR types

Others

PR changes

Others

Describe

增加光孤子和光学怪波的案例

paddle-bot · 2024-04-08T03:52:58Z

Thanks for your contribution!

HydrogenSulfate

辛苦suyong研发两个新的光学方程案例👍
有几处代码前段时间做了优化，可以按照review，进一步简化一下代码

HydrogenSulfate · 2024-04-08T05:27:35Z

examples/NLS-MB/conf/NLS-MB_soliton.yaml

+          - mode
+          - output_dir
+          - log_freq
+  sweep:


sweep上方可以加上callbacks字段，这个字段可以自动进行随机种子和文件夹创建操作

PaddleScience/examples/bracket/conf/bracket.yaml

Lines 16 to 20 in 07b440f

- log_freq

callbacks:

init_callback:

_target_: ppsci.utils.callbacks.InitCallback

sweep:

HydrogenSulfate · 2024-04-08T05:27:51Z

examples/NLS-MB/conf/NLS-MB_soliton.yaml

+# model settings
+MODEL:
+  input_keys: ["x", "t"]
+  output_keys: ["Eu","Ev","pu","pv","eta"]


List字符之间加上空格

HydrogenSulfate · 2024-04-08T05:30:51Z

examples/NLS-MB/conf/NLS-MB_soliton.yaml

+  iters_per_epoch: 1
+  lbfgs:
+    iters_per_epoch: ${TRAIN.iters_per_epoch}
+    output_dir: ./outputs_NLS-MB_soliton_L-BFGS


这里使用引用语法感觉会更好？：output_dir: ${output_dir}LBFGS

HydrogenSulfate · 2024-04-08T05:31:51Z

ppsci/equation/pde/nls_m_b.py

+from ppsci.equation.pde import base
+
+
+class NLSMB(base.PDE):


是否能加上对应的docstring呢（公式使用katex，语法与latex基本相同，可以本地mkdocs 渲染自测）？这样文档中可以渲染出公式

HydrogenSulfate · 2024-04-08T05:35:08Z

ppsci/equation/__init__.py

docs/zh/api/equation.md里也添加一下NLSMB，这样文档能检索到

HydrogenSulfate · 2024-04-08T05:38:19Z

examples/NLS-MB/NLS-MB_optical_rogue_wave.py

+        "sampler": {
+            "name": "BatchSampler",
+            "drop_last": False,
+            "shuffle": False,
+        },


drop_last和shuffle都是False的话，"sampler"字段可以删除，

PaddleScience/ppsci/data/__init__.py

Lines 70 to 100 in 07b440f

sampler_cfg = cfg.pop("sampler", None)

if sampler_cfg is not None:

batch_sampler_cls = sampler_cfg.pop("name")

if batch_sampler_cls == "BatchSampler":

if world_size > 1:

batch_sampler_cls = "DistributedBatchSampler"

logger.warning(

f"Automatically use 'DistributedBatchSampler' instead of "

f"'BatchSampler' when world_size({world_size}) > 1."

)

sampler_cfg["batch_size"] = cfg["batch_size"]

batch_sampler = getattr(io, batch_sampler_cls)(_dataset, **sampler_cfg)

else:

batch_sampler_cls = "BatchSampler"

if world_size > 1:

batch_sampler_cls = "DistributedBatchSampler"

logger.warning(

f"Automatically use 'DistributedBatchSampler' instead of "

f"'BatchSampler' when world_size({world_size}) > 1."

)

batch_sampler = getattr(io, batch_sampler_cls)(

_dataset,

batch_size=cfg["batch_size"],

shuffle=False,

drop_last=False,

)

logger.message(

"'shuffle' and 'drop_last' are both set to False in default as sampler config is not specified."

)

HydrogenSulfate · 2024-04-08T05:40:05Z

examples/NLS-MB/NLS-MB_optical_rogue_wave.py

+    # set random seed for reproducibility
+    ppsci.utils.misc.set_random_seed(cfg.seed)
+    # initialize logger
+    logger.init_logger("ppsci", osp.join(cfg.output_dir, f"{cfg.mode}.log"), "info")
+


同上可以删除

HydrogenSulfate · 2024-04-08T05:40:40Z

examples/NLS-MB/NLS-MB_optical_soliton.py

+    # set random seed for reproducibility
+    ppsci.utils.misc.set_random_seed(cfg.seed)
+
+    # initialize logger
+    logger.init_logger("ppsci", osp.join(cfg.output_dir, f"{cfg.mode}.log"), "info")
+


同上，可以删除

HydrogenSulfate · 2024-04-08T05:40:47Z

examples/NLS-MB/NLS-MB_optical_soliton.py

+        "sampler": {
+            "name": "BatchSampler",
+            "drop_last": False,
+            "shuffle": False,
+        },


同上，可以删除

HydrogenSulfate · 2024-04-08T05:41:28Z

examples/NLS-MB/conf/NLS-MB_rogue_wave.yaml

+          - output_dir
+          - log_freq
+  sweep:


同上，可以加上callbacks字段

HydrogenSulfate

辛苦再补充一下导出推理代码和文档内的执行脚本，以及结果展示

HydrogenSulfate · 2024-04-15T12:27:17Z

docs/zh/examples/nlsmb.md

+```
+
+## 5. 结果展示
+


https://paddle-org.bj.bcebos.com/paddlescience/docs/NLS-MB/pred_optical_rogue_wave.png

https://paddle-org.bj.bcebos.com/paddlescience/docs/NLS-MB/pred_optical_soliton.png

HydrogenSulfate · 2024-04-15T12:28:11Z

docs/zh/examples/nlsmb.md

@@ -0,0 +1,196 @@
+# NLS-MB
+


https://paddle-org.bj.bcebos.com/paddlescience/models/NLS-MB/NLS-MB_rogue_wave_pretrained.pdparams
https://paddle-org.bj.bcebos.com/paddlescience/models/NLS-MB/NLS-MB_soliton_pretrained.pdparams

HydrogenSulfate · 2024-04-17T05:06:19Z

examples/NLS-MB/NLS-MB_optical_rogue_wave.py

+    plt.figure(figsize=(10, 10))
+    plt.subplot(3, 3, 1)
+    plt.title("E_ref")
+    plt.tricontourf(x, t, E_ref[:, 0], levels=256, cmap="jet")
+    plt.subplot(3, 3, 2)
+    plt.title("E_pred")
+    plt.tricontourf(x, t, E_pred[:, 0], levels=256, cmap="jet")
+    plt.subplot(3, 3, 3)
+    plt.title("E_diff")
+    plt.tricontourf(x, t, np.abs(E_ref[:, 0] - E_pred[:, 0]), levels=256, cmap="jet")
+    plt.subplot(3, 3, 4)
+    plt.title("p_ref")
+    plt.tricontourf(x, t, p_ref[:, 0], levels=256, cmap="jet")
+    plt.subplot(3, 3, 5)
+    plt.title("p_pred")
+    plt.tricontourf(x, t, p_pred[:, 0], levels=256, cmap="jet")
+    plt.subplot(3, 3, 6)
+    plt.title("p_diff")
+    plt.tricontourf(x, t, np.abs(p_ref[:, 0] - p_pred[:, 0]), levels=256, cmap="jet")
+    plt.subplot(3, 3, 7)
+    plt.title("eta_ref")
+    plt.tricontourf(x, t, eta_ref[:, 0], levels=256, cmap="jet")
+    plt.subplot(3, 3, 8)
+    plt.title("eta_pred")
+    plt.tricontourf(x, t, eta_pred[:, 0], levels=256, cmap="jet")
+    plt.subplot(3, 3, 9)
+    plt.title("eta_diff")
+    plt.tricontourf(
+        x, t, np.abs(eta_ref[:, 0] - eta_pred[:, 0]), levels=256, cmap="jet"
+    )
+    plt.savefig(osp.join(cfg.output_dir, "pred_optical_rogue_wave.png"))


plot相关代码可以提取变成一个函数，给train、evaluate、inference使用，类似：

PaddleScience/examples/allen_cahn/allen_cahn_plain.py

Lines 20 to 58 in 8d7dadd

def plot(

t_star: np.ndarray,

x_star: np.ndarray,

u_ref: np.ndarray,

u_pred: np.ndarray,

output_dir: str,

):

fig = plt.figure(figsize=(18, 5))

TT, XX = np.meshgrid(t_star, x_star, indexing="ij")

u_ref = u_ref.reshape([len(t_star), len(x_star)])

plt.subplot(1, 3, 1)

plt.pcolor(TT, XX, u_ref, cmap="jet")

plt.colorbar()

plt.xlabel("t")

plt.ylabel("x")

plt.title("Exact")

plt.tight_layout()

plt.subplot(1, 3, 2)

plt.pcolor(TT, XX, u_pred, cmap="jet")

plt.colorbar()

plt.xlabel("t")

plt.ylabel("x")

plt.title("Predicted")

plt.tight_layout()

plt.subplot(1, 3, 3)

plt.pcolor(TT, XX, np.abs(u_ref - u_pred), cmap="jet")

plt.colorbar()

plt.xlabel("t")

plt.ylabel("x")

plt.title("Absolute error")

plt.tight_layout()

fig_path = osp.join(output_dir, "ac.png")

print(f"Saving figure to {fig_path}")

fig.savefig(fig_path, bbox_inches="tight", dpi=400)

plt.close()

plot完毕后，建议调用一下plt.close()

HydrogenSulfate

LGTM

* add NLS-MB example * fix * fix * fix * fix * modify * modify * modify * fix

xusuyong added 5 commits April 8, 2024 10:19

add NLS-MB example

53acdf9

fix

65c2632

fix

9cb80b6

fix

9ac697e

fix

8c3e15f

paddle-bot bot added the contributor label Apr 8, 2024

HydrogenSulfate requested changes Apr 8, 2024

View reviewed changes

xusuyong changed the title ~~Add nls-mb example~~ [New example] Add nls-mb example Apr 8, 2024

xusuyong and others added 4 commits April 12, 2024 11:06

modify

be91caa

modify

533ea5f

modify

669c1da

Merge branch 'develop' into add_NLS-MB_example

4ffba58

HydrogenSulfate requested changes Apr 15, 2024

View reviewed changes

HydrogenSulfate requested changes Apr 17, 2024

View reviewed changes

xusuyong and others added 2 commits April 17, 2024 17:45

fix

54e1b4f

Merge branch 'develop' into add_NLS-MB_example

d8a9fc2

HydrogenSulfate approved these changes Apr 18, 2024

View reviewed changes

HydrogenSulfate merged commit fd3a7f9 into PaddlePaddle:develop Apr 18, 2024
3 of 4 checks passed

xusuyong deleted the add_NLS-MB_example branch April 22, 2024 08:29

huohuohuohuohuo123 pushed a commit to huohuohuohuohuo123/PaddleScience that referenced this pull request Aug 12, 2024

[New example] Add nls-mb example (PaddlePaddle#838)

8ad8d0c

* add NLS-MB example * fix * fix * fix * fix * modify * modify * modify * fix

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[New example] Add nls-mb example #838

[New example] Add nls-mb example #838

xusuyong commented Apr 8, 2024

paddle-bot bot commented Apr 8, 2024

HydrogenSulfate left a comment

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate Apr 8, 2024

HydrogenSulfate left a comment

HydrogenSulfate Apr 15, 2024

HydrogenSulfate Apr 15, 2024

HydrogenSulfate Apr 17, 2024

HydrogenSulfate left a comment

	- log_freq
	callbacks:
	init_callback:
	_target_: ppsci.utils.callbacks.InitCallback
	sweep:

	sampler_cfg = cfg.pop("sampler", None)
	if sampler_cfg is not None:
	batch_sampler_cls = sampler_cfg.pop("name")

	if batch_sampler_cls == "BatchSampler":
	if world_size > 1:
	batch_sampler_cls = "DistributedBatchSampler"
	logger.warning(
	f"Automatically use 'DistributedBatchSampler' instead of "
	f"'BatchSampler' when world_size({world_size}) > 1."
	)

	sampler_cfg["batch_size"] = cfg["batch_size"]
	batch_sampler = getattr(io, batch_sampler_cls)(_dataset, **sampler_cfg)
	else:
	batch_sampler_cls = "BatchSampler"
	if world_size > 1:
	batch_sampler_cls = "DistributedBatchSampler"
	logger.warning(
	f"Automatically use 'DistributedBatchSampler' instead of "
	f"'BatchSampler' when world_size({world_size}) > 1."
	)
	batch_sampler = getattr(io, batch_sampler_cls)(
	_dataset,
	batch_size=cfg["batch_size"],
	shuffle=False,
	drop_last=False,
	)
	logger.message(
	"'shuffle' and 'drop_last' are both set to False in default as sampler config is not specified."
	)

	def plot(
	t_star: np.ndarray,
	x_star: np.ndarray,
	u_ref: np.ndarray,
	u_pred: np.ndarray,
	output_dir: str,
	):
	fig = plt.figure(figsize=(18, 5))
	TT, XX = np.meshgrid(t_star, x_star, indexing="ij")
	u_ref = u_ref.reshape([len(t_star), len(x_star)])

	plt.subplot(1, 3, 1)
	plt.pcolor(TT, XX, u_ref, cmap="jet")
	plt.colorbar()
	plt.xlabel("t")
	plt.ylabel("x")
	plt.title("Exact")
	plt.tight_layout()

	plt.subplot(1, 3, 2)
	plt.pcolor(TT, XX, u_pred, cmap="jet")
	plt.colorbar()
	plt.xlabel("t")
	plt.ylabel("x")
	plt.title("Predicted")
	plt.tight_layout()

	plt.subplot(1, 3, 3)
	plt.pcolor(TT, XX, np.abs(u_ref - u_pred), cmap="jet")
	plt.colorbar()
	plt.xlabel("t")
	plt.ylabel("x")
	plt.title("Absolute error")
	plt.tight_layout()

	fig_path = osp.join(output_dir, "ac.png")
	print(f"Saving figure to {fig_path}")
	fig.savefig(fig_path, bbox_inches="tight", dpi=400)
	plt.close()

		```

		## 5. 结果展示

[New example] Add nls-mb example #838

[New example] Add nls-mb example #838

Conversation

xusuyong commented Apr 8, 2024

PR types

PR changes

Describe

paddle-bot bot commented Apr 8, 2024

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate left a comment

Choose a reason for hiding this comment