mjxntpgec
/
mindspore
forked from OSSInnovation/mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust source code format and check scripts, format source codes in 

directory 'mindspore/core'
This commit is contained in:
fary86 2020-07-28 10:30:27 +08:00
parent 16079e6356
commit a7fc02cb60
7 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mindspore/core/base/base_ref_utils.h
View File

@ -21,7 +21,6 @@
#include "ir/tensor.h" #include "ir/tensor.h"
#include "base/base_ref.h" #include "base/base_ref.h"
#ifndef MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H #ifndef MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H
#define MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H #define MINDSPORE_CCSRC_UTILS_BASE_REF_UTILS_H
namespace mindspore { namespace mindspore {

4
mindspore/core/ir/anf.h
View File

@ -180,7 +180,9 @@ class AnfNode : public Base {
bool HasUserData(const std::string &key) const { return user_data_.has(key); } bool HasUserData(const std::string &key) const { return user_data_.has(key); }
template <typename T> template <typename T>
bool HasUserData() const { return user_data_.has(T::key); } bool HasUserData() const {
return user_data_.has(T::key);
}
protected: protected:
// Hold a weak ref to Graph as Graph also hold ref to AnfNode. // Hold a weak ref to Graph as Graph also hold ref to AnfNode.

4
mindspore/core/ir/pattern_matcher.h
View File

@ -40,9 +40,7 @@ namespace mindspore {
template <typename T> template <typename T>
class PBase { class PBase {
public: public:
bool CheckFunc(const PredicateFuncType &func, const AnfNodePtr &node) { bool CheckFunc(const PredicateFuncType &func, const AnfNodePtr &node) { return func(get_object().GetNode(node)); }
return func(get_object().GetNode(node));
}
const T &get_object() const { return *static_cast<const T *>(this); } const T &get_object() const { return *static_cast<const T *>(this); }

1
mindspore/core/ir/primitive.cc
View File

@ -19,7 +19,6 @@
#include <utility> #include <utility>
#include "abstract/abstract_function.h" #include "abstract/abstract_function.h"
namespace mindspore { namespace mindspore {
abstract::AbstractBasePtr Primitive::ToAbstract() { abstract::AbstractBasePtr Primitive::ToAbstract() {

2
mindspore/core/utils/flags.h
View File

@ -23,6 +23,6 @@ extern const char GRAPH_FLAG_HAS_EFFECT[];
extern const char GRAPH_FLAG_EFFECT_PATIAL_ORDER[]; extern const char GRAPH_FLAG_EFFECT_PATIAL_ORDER[];
extern const char GRAPH_FLAG_RANDOM_EFFECT[]; extern const char GRAPH_FLAG_RANDOM_EFFECT[];
extern const char GRAPH_FLAG_SIDE_EFFECT[]; extern const char GRAPH_FLAG_SIDE_EFFECT[];
} } // namespace mindspore
#endif // MINDSPORE_CORE_UTILS_FLAGS_H #endif // MINDSPORE_CORE_UTILS_FLAGS_H

6
scripts/check_clang_format.sh
View File

@ -86,12 +86,12 @@ cd "${SCRIPTS_PATH}/.." || exit 1
CHECK_LIST_FILE='__checked_files_list__' CHECK_LIST_FILE='__checked_files_list__'
if [ "X${mode}" == "Xall" ]; then if [ "X${mode}" == "Xall" ]; then
find mindspore/ccsrc -type f -name "*" | grep "\.h$\|\.cc$" > "${CHECK_LIST_FILE}" || true find mindspore/{ccsrc,core} -type f -name "*" | grep "\.h$\|\.cc$" > "${CHECK_LIST_FILE}" || true
elif [ "X${mode}" == "Xchanged" ]; then elif [ "X${mode}" == "Xchanged" ]; then
# --diff-filter=ACMRTUXB will ignore deleted files in commit # --diff-filter=ACMRTUXB will ignore deleted files in commit
git diff --diff-filter=ACMRTUXB --name-only | grep "mindspore/ccsrc" | grep "\.h$\|\.cc$" > "${CHECK_LIST_FILE}" || true git diff --diff-filter=ACMRTUXB --name-only | grep "mindspore/ccsrc\|mindspore/core" | grep "\.h$\|\.cc$" > "${CHECK_LIST_FILE}" || true
else # "X${mode}" == "Xlastcommit" else # "X${mode}" == "Xlastcommit"
git diff --diff-filter=ACMRTUXB --name-only HEAD~ HEAD | grep "mindspore/ccsrc" | grep "\.h$\|\.cc$" > "${CHECK_LIST_FILE}" || true git diff --diff-filter=ACMRTUXB --name-only HEAD~ HEAD | grep "mindspore/ccsrc\|mindspore/core" | grep "\.h$\|\.cc$" > "${CHECK_LIST_FILE}" || true
fi fi
CHECK_RESULT_FILE=__code_format_check_result__ CHECK_RESULT_FILE=__code_format_check_result__

6
scripts/format_source_code.sh
View File

@ -86,11 +86,11 @@ cd "${SCRIPTS_PATH}/.." || exit 1
FMT_FILE_LIST='__format_files_list__' FMT_FILE_LIST='__format_files_list__'
if [[ "X${mode}" == "Xall" ]]; then if [[ "X${mode}" == "Xall" ]]; then
find mindspore/ccsrc -type f -name "*" | grep "\.h$\|\.cc$" > "${FMT_FILE_LIST}" || true find mindspore/{ccsrc,core} -type f -name "*" | grep "\.h$\|\.cc$" > "${FMT_FILE_LIST}" || true
elif [[ "X${mode}" == "Xchanged" ]]; then elif [[ "X${mode}" == "Xchanged" ]]; then
git diff --name-only | grep "mindspore/ccsrc" | grep "\.h$\|\.cc$" > "${FMT_FILE_LIST}" || true git diff --name-only | grep "mindspore/ccsrc\|mindspore/core" | grep "\.h$\|\.cc$" > "${FMT_FILE_LIST}" || true
else # "X${mode}" == "Xlastcommit" else # "X${mode}" == "Xlastcommit"
git diff --name-only HEAD~ HEAD | grep "mindspore/ccsrc" | grep "\.h$\|\.cc$" > "${FMT_FILE_LIST}" || true git diff --name-only HEAD~ HEAD | grep "mindspore/ccsrc\|mindspore/core" | grep "\.h$\|\.cc$" > "${FMT_FILE_LIST}" || true
fi fi
while read line; do while read line; do