mindspore 2.1.0__cp37-cp37m-win_amd64.whl → 2.2.11__cp37-cp37m-win_amd64.whl

mindspore/include/dataset/vision_lite.h

@@ -1,5 +1,5 @@
 /**
- * Copyright 2020-2022 Huawei Technologies Co., Ltd
+ * Copyright 2020-2023 Huawei Technologies Co., Ltd
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -67,7 +67,7 @@ class DATASET_API Affine final : public TensorTransform {
                   const std::vector<uint8_t> &fill_value = {0, 0, 0});
 
   /// \brief Destructor.
-  ~Affine() = default;
+  ~Affine() override = default;
 
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
   /// \return Shared pointer to TensorOperation object.
@@ -98,7 +98,7 @@ class DATASET_API CenterCrop final : public TensorTransform {
   explicit CenterCrop(const std::vector<int32_t> &size);
 
   /// \brief Destructor.
-  ~CenterCrop() = default;
+  ~CenterCrop() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -133,7 +133,7 @@ class DATASET_API Crop final : public TensorTransform {
   Crop(const std::vector<int32_t> &coordinates, const std::vector<int32_t> &size);
 
   /// \brief Destructor.
-  ~Crop() = default;
+  ~Crop() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -162,7 +162,7 @@ class DATASET_API Decode final : public TensorTransform {
   explicit Decode(bool rgb = true);
 
   /// \brief Destructor.
-  ~Decode() = default;
+  ~Decode() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -196,7 +196,7 @@ class DATASET_API GaussianBlur final : public TensorTransform {
   explicit GaussianBlur(const std::vector<int32_t> &kernel_size, const std::vector<float> &sigma = {0., 0.});
 
   /// \brief Destructor.
-  ~GaussianBlur() = default;
+  ~GaussianBlur() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -222,7 +222,7 @@ class DATASET_API HWC2CHW final : public TensorTransform {
   HWC2CHW();
 
   /// \brief Destructor.
-  ~HWC2CHW() = default;
+  ~HWC2CHW() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -254,7 +254,7 @@ class DATASET_API Normalize final : public TensorTransform {
   Normalize(const std::vector<float> &mean, const std::vector<float> &std, bool is_hwc = true);
 
   /// \brief Destructor.
-  ~Normalize() = default;
+  ~Normalize() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -302,7 +302,7 @@ class DATASET_API Pad final : public TensorTransform {
                BorderType padding_mode = BorderType::kConstant);
 
   /// \brief Destructor.
-  ~Pad() = default;
+  ~Pad() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -354,7 +354,7 @@ class DATASET_API RandomAffine final : public TensorTransform {
                         const std::vector<uint8_t> &fill_value = {0, 0, 0});
 
   /// \brief Destructor.
-  ~RandomAffine() = default;
+  ~RandomAffine() override = default;
 
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
   /// \return Shared pointer to TensorOperation object.
@@ -384,7 +384,7 @@ class DATASET_API Rescale final : public TensorTransform {
   Rescale(float rescale, float shift);
 
   /// \brief Destructor.
-  ~Rescale() = default;
+  ~Rescale() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -422,7 +422,7 @@ class DATASET_API Resize final : public TensorTransform {
   explicit Resize(const std::vector<int32_t> &size, InterpolationMode interpolation = InterpolationMode::kLinear);
 
   /// \brief Destructor.
-  ~Resize() = default;
+  ~Resize() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -464,7 +464,7 @@ class DATASET_API ResizePreserveAR final : public TensorTransform {
   ResizePreserveAR(int32_t height, int32_t width, int32_t img_orientation = 0);
 
   /// \brief Destructor.
-  ~ResizePreserveAR() = default;
+  ~ResizePreserveAR() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -494,7 +494,7 @@ class DATASET_API RGB2BGR final : public TensorTransform {
   RGB2BGR() = default;
 
   /// \brief Destructor.
-  ~RGB2BGR() = default;
+  ~RGB2BGR() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -521,7 +521,7 @@ class DATASET_API RGB2GRAY final : public TensorTransform {
   RGB2GRAY() = default;
 
   /// \brief Destructor.
-  ~RGB2GRAY() = default;
+  ~RGB2GRAY() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -582,7 +582,7 @@ class DATASET_API Rotate final : public TensorTransform {
                   const std::vector<float> &center = {}, const std::vector<uint8_t> &fill_value = {0, 0, 0});
 
   /// \brief Destructor.
-  ~Rotate() = default;
+  ~Rotate() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.
@@ -612,7 +612,7 @@ class DATASET_API SwapRedBlue final : public TensorTransform {
   SwapRedBlue();
 
   /// \brief Destructor.
-  ~SwapRedBlue() = default;
+  ~SwapRedBlue() override = default;
 
  protected:
   /// \brief The function to convert a TensorTransform object into a TensorOperation object.

mindspore/mindrecord/tools/imagenet_to_mr.py

@@ -169,7 +169,7 @@ class ImageNetToMR:
             raise IOError("map file {} not exists".format(self.map_file))
 
         label_dict = {}
-        with open(real_file_path) as fp:
+        with open(real_file_path, "r") as fp:
             line = fp.readline()
             while line:
                 labels = line.split(" ")

mindspore/mindrecord/tools/mnist_to_mr.py

@@ -129,7 +129,7 @@ class MnistToMR:
     def _extract_images(self, filename):
         """Extract the images into a 4D tensor [image index, y, x, channels]."""
         real_file_path = os.path.realpath(filename)
-        with gzip.open(real_file_path) as bytestream:
+        with gzip.open(real_file_path, "rb") as bytestream:
             bytestream.read(16)
             buf = bytestream.read()
             data = np.frombuffer(buf, dtype=np.uint8)
@@ -139,7 +139,7 @@ class MnistToMR:
     def _extract_labels(self, filename):
         """Extract the labels into a vector of int64 label IDs."""
         real_file_path = os.path.realpath(filename)
-        with gzip.open(real_file_path) as bytestream:
+        with gzip.open(real_file_path, "rb") as bytestream:
             bytestream.read(8)
             buf = bytestream.read()
             labels = np.frombuffer(buf, dtype=np.uint8).astype(np.int64)

mindspore/nn/__init__.py

@@ -31,7 +31,6 @@ from mindspore.nn.wrap import *
 from mindspore.nn.grad import Jvp, Vjp
 from mindspore.nn.sparse import *
 from mindspore.nn.reinforcement import *
-from mindspore.nn.lr_scheduler import *
 
 __all__ = ["Cell", "GraphCell"]
 __all__.extend(layer.__all__)
@@ -44,6 +43,5 @@ __all__.extend(sparse.__all__)
 __all__.extend(learning_rate_schedule.__all__)
 __all__.extend(dynamic_lr.__all__)
 __all__.extend(reinforcement.__all__)
-__all__.extend(lr_scheduler.__all__)
 
 __all__.sort()