【PaddlePaddle】Update nadaraya-waston.md & Adjust warnings (d2l-ai#1218)

* Update nadaraya-waston.md * Change warning location * Add warning filter to index.md * Test warnings of d2l.paddle * Adjust warnings * Optimize warnings * Update chapter_convolutional-modern warnings
DeepblueQ · Nov 9, 2022 · 7f4c68d · 7f4c68d
1 parent 318d0e3
commit 7f4c68d
Show file tree

Hide file tree

Showing 87 changed files with 168 additions and 228 deletions.
diff --git a/chapter_attention-mechanisms/attention-cues.md b/chapter_attention-mechanisms/attention-cues.md
@@ -118,11 +118,10 @@ import tensorflow as tf
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 为了可视化注意力权重，需要定义一个`show_heatmaps`函数。

diff --git a/chapter_attention-mechanisms/attention-scoring-functions.md b/chapter_attention-mechanisms/attention-scoring-functions.md
@@ -64,13 +64,12 @@ import tensorflow as tf
 
 ```{.python .input}
 #@tab paddle
-import warnings
+from d2l import paddle as d2l
 import math
+import warnings
 warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## [**掩蔽softmax操作**]

diff --git a/chapter_attention-mechanisms/bahdanau-attention.md b/chapter_attention-mechanisms/bahdanau-attention.md
@@ -65,11 +65,11 @@ import tensorflow as tf
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## 定义注意力解码器

diff --git a/chapter_attention-mechanisms/multihead-attention.md b/chapter_attention-mechanisms/multihead-attention.md
@@ -75,13 +75,12 @@ import tensorflow as tf
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
-import math
 warnings.filterwarnings("ignore")
+import math
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## 实现

diff --git a/chapter_attention-mechanisms/nadaraya-waston.md b/chapter_attention-mechanisms/nadaraya-waston.md
@@ -33,12 +33,11 @@ tf.random.set_seed(seed=1322)
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## [**生成数据集**]
@@ -121,7 +120,7 @@ def f(x):
     return 2 * paddle.sin(x) + x**0.8
 
 y_train = f(x_train) + paddle.normal(0.0, 0.5, (n_train,))  # 训练样本的输出
-x_test = d2l.arange(0, 50, 1) * 0.1  # 测试样本
+x_test = d2l.arange(0, 5, 0.1, dtype='float32')   # 测试样本
 y_truth = f(x_test)  # 测试样本的真实输出
 n_test = len(x_test)  # 测试样本数
 n_test

diff --git a/chapter_attention-mechanisms/self-attention-and-positional-encoding.md b/chapter_attention-mechanisms/self-attention-and-positional-encoding.md
@@ -36,13 +36,12 @@ import tensorflow as tf
 
 ```{.python .input}
 #@tab paddle
-import warnings
+from d2l import paddle as d2l
 import math
+import warnings
 warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## [**自注意力**]

diff --git a/chapter_attention-mechanisms/transformer.md b/chapter_attention-mechanisms/transformer.md
@@ -45,14 +45,13 @@ import tensorflow as tf
 
 ```{.python .input}
 #@tab paddle
-import warnings
+from d2l import paddle as d2l
 import math
 import pandas as pd
+import warnings
 warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## [**基于位置的前馈网络**]

diff --git a/chapter_computational-performance/async-computation.md b/chapter_computational-performance/async-computation.md
@@ -23,12 +23,12 @@ from torch import nn
 
 ```{.python .input}
 #@tab paddle
-import warnings
+from d2l import paddle as d2l
 import numpy, os, subprocess
+import warnings
+warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 d2l.try_gpu()
 ```
 

diff --git a/chapter_computational-performance/auto-parallelism.md b/chapter_computational-performance/auto-parallelism.md
@@ -21,11 +21,11 @@ import torch
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import paddle
 import numpy as np
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## 基于GPU的并行计算

diff --git a/chapter_computational-performance/hybridize.md b/chapter_computational-performance/hybridize.md
@@ -154,16 +154,14 @@ net(x)
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
-warnings.filterwarnings('ignore')
+warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
 from paddle.jit import to_static
 from paddle.static import InputSpec
 
-warnings.filterwarnings("ignore")
-from d2l import paddle as d2l
-
 # 生产网络的工厂模式
 def get_net():
     blocks = [

diff --git a/chapter_computational-performance/multiple-gpus-concise.md b/chapter_computational-performance/multiple-gpus-concise.md
@@ -19,11 +19,11 @@ from torch import nn
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## [**简单网络**]

diff --git a/chapter_computational-performance/multiple-gpus.md b/chapter_computational-performance/multiple-gpus.md
@@ -101,12 +101,12 @@ from torch.nn import functional as F
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
 from paddle.nn import functional as F
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## [**简单网络**]

diff --git a/chapter_computer-vision/anchor.md b/chapter_computer-vision/anchor.md
@@ -29,12 +29,11 @@ torch.set_printoptions(2)  # 精简输出精度
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
 import numpy as np
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 
 paddle.set_printoptions(2)  # 精简输出精度
 ```

diff --git a/chapter_computer-vision/bounding-box.md b/chapter_computer-vision/bounding-box.md
@@ -38,11 +38,10 @@ import tensorflow as tf
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 下面加载本节将使用的示例图像。可以看到图像左边是一只狗，右边是一只猫。

diff --git a/chapter_computer-vision/fcn.md b/chapter_computer-vision/fcn.md
@@ -28,14 +28,13 @@ from torch.nn import functional as F
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
 from paddle.nn import functional as F
-warnings.filterwarnings("ignore", category=DeprecationWarning)
 import paddle.vision as paddlevision
-from d2l import paddle as d2l
 ```
 
 ## 构造模型

diff --git a/chapter_computer-vision/fine-tuning.md b/chapter_computer-vision/fine-tuning.md
@@ -63,13 +63,13 @@ import os
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 from paddle import nn
 import paddle
 import paddle.vision as paddlevision
 import os
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ### 获取数据集

diff --git a/chapter_computer-vision/image-augmentation.md b/chapter_computer-vision/image-augmentation.md
@@ -29,13 +29,12 @@ from torch import nn
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
 import paddle.vision as paddlevision
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## 常用的图像增广方法

diff --git a/chapter_computer-vision/kaggle-cifar10.md b/chapter_computer-vision/kaggle-cifar10.md
@@ -45,18 +45,17 @@ import shutil
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import collections
 import math
 import os
 import pandas as pd
 import shutil
-warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
 import paddle.vision as paddlevision
-from d2l import paddle as d2l
 ```
 
 ## 获取并组织数据集

diff --git a/chapter_computer-vision/kaggle-dog.md b/chapter_computer-vision/kaggle-dog.md
@@ -33,13 +33,13 @@ import os
 
 ```{.python .input}
 #@tab paddle
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import paddle
 import paddle.vision as paddlevision
 from paddle import nn
 import os
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## 获取和整理数据集

diff --git a/chapter_computer-vision/multiscale-object-detection.md b/chapter_computer-vision/multiscale-object-detection.md
@@ -45,11 +45,10 @@ h, w
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 
 img = d2l.plt.imread('../img/catdog.jpg')
 h, w = img.shape[:2]

diff --git a/chapter_computer-vision/neural-style.md b/chapter_computer-vision/neural-style.md
@@ -68,12 +68,10 @@ d2l.plt.imshow(content_img);
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
-import warnings
+from d2l import paddle as d2l
 import paddle
 import paddle.vision as paddlevision
 import paddle.nn as nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 
 d2l.set_figsize()
 content_img = d2l.Image.open('../img/rainier.jpg')

diff --git a/chapter_computer-vision/object-detection-dataset.md b/chapter_computer-vision/object-detection-dataset.md
@@ -34,14 +34,13 @@ import pandas as pd
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
+warnings.filterwarnings("ignore")
 import os
 import pandas as pd
-warnings.filterwarnings("ignore")
 import paddle
-warnings.filterwarnings("ignore", category=DeprecationWarning)
 import paddle.vision as paddlevision
-from d2l import paddle as d2l
 ```
 
 ```{.python .input}

diff --git a/chapter_computer-vision/semantic-segmentation-and-dataset.md b/chapter_computer-vision/semantic-segmentation-and-dataset.md
@@ -44,13 +44,12 @@ import os
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
 import paddle.vision as paddlevision
 import os
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 数据集的tar文件大约为2GB，所以下载可能需要一段时间。

diff --git a/chapter_computer-vision/ssd.md b/chapter_computer-vision/ssd.md
@@ -72,14 +72,13 @@ def cls_predictor(num_inputs, num_anchors, num_classes):
 ```{.python .input}
 #@tab paddle
 %matplotlib inline
+from d2l import paddle as d2l
 import warnings
 warnings.filterwarnings("ignore")
 import paddle
 from paddle import nn
 from paddle.nn import functional as F
 import paddle.vision as paddlevision
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 
 def cls_predictor(num_inputs, num_anchors, num_classes):
     return nn.Conv2D(num_inputs, num_anchors * (num_classes + 1),

diff --git a/chapter_computer-vision/transposed-conv.md b/chapter_computer-vision/transposed-conv.md
@@ -27,12 +27,9 @@ from d2l import torch as d2l
 
 ```{.python .input}
 #@tab paddle
-import warnings
-warnings.filterwarnings("ignore")
+from d2l import paddle as d2l
 import paddle
 from paddle import nn
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-from d2l import paddle as d2l
 ```
 
 ## 基本操作