Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Sanitize sanitise to sanitize
This patch aims to sanitize uses of sanitise to the form of sanitize to be consistent with the overall codebases use of American English.
  • Loading branch information
Mousius committed Sep 28, 2021
commit d4e6c261716fc3091b959c413701afd549f50d75
8 changes: 4 additions & 4 deletions python/tvm/relay/backend/name_transforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,12 @@ def prefix_generated_name(names: Union[List[str], str]):
return _backend.PrefixGeneratedName(_preprocess_names(names))


def sanitise_name(original_name: str):
"""Sanitise name for output into compiler artifacts
def sanitize_name(original_name: str):
"""Sanitize name for output into compiler artifacts

Parameters
----------
original_name : str
Original name to sanitise
Original name to sanitize
"""
return _backend.SanitiseName(original_name)
return _backend.SanitizeName(original_name)
16 changes: 8 additions & 8 deletions src/relay/backend/name_transforms.cc
Original file line number Diff line number Diff line change
Expand Up @@ -76,28 +76,28 @@ std::string CombineNames(const Array<String>& names) {
return combined_name;
}

std::string SanitiseName(const std::string& name) {
std::string SanitizeName(const std::string& name) {
ICHECK(!name.empty()) << "Name is empty";

auto multipleSeparators = [](char before, char after) {
return before == '_' && before == after;
};
auto isNotAlnum = [](char c) { return !std::isalnum(c); };
std::string sanitised_input = name;
std::replace_if(sanitised_input.begin(), sanitised_input.end(), isNotAlnum, '_');
std::string sanitized_input = name;
std::replace_if(sanitized_input.begin(), sanitized_input.end(), isNotAlnum, '_');

sanitised_input.erase(
std::unique(sanitised_input.begin(), sanitised_input.end(), multipleSeparators),
sanitised_input.end());
sanitized_input.erase(
std::unique(sanitized_input.begin(), sanitized_input.end(), multipleSeparators),
sanitized_input.end());

return sanitised_input;
return sanitized_input;
}

TVM_REGISTER_GLOBAL("relay.backend.ToCFunctionStyle").set_body_typed(ToCFunctionStyle);
TVM_REGISTER_GLOBAL("relay.backend.ToCVariableStyle").set_body_typed(ToCVariableStyle);
TVM_REGISTER_GLOBAL("relay.backend.PrefixName").set_body_typed(PrefixName);
TVM_REGISTER_GLOBAL("relay.backend.PrefixGeneratedName").set_body_typed(PrefixGeneratedName);
TVM_REGISTER_GLOBAL("relay.backend.SanitiseName").set_body_typed(SanitiseName);
TVM_REGISTER_GLOBAL("relay.backend.SanitizeName").set_body_typed(SanitizeName);

} // namespace backend
} // namespace relay
Expand Down
6 changes: 3 additions & 3 deletions src/relay/backend/name_transforms.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ inline std::string PrefixGeneratedName(const Array<String>& names) {
}

/*!
* \brief Sanitise name for output into compiler artifacts
* \brief Sanitize name for output into compiler artifacts
* \param name Original name
* \return Sanitised name
* \return Sanitized name
*/
std::string SanitiseName(const std::string& name);
std::string SanitizeName(const std::string& name);

} // namespace backend
} // namespace relay
Expand Down
14 changes: 7 additions & 7 deletions tests/cpp/name_transforms_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ TEST(NameTransforms, CombineNames) {
EXPECT_THROW(CombineNames({"", "Woof"}), InternalError);
}

TEST(NameTransforms, SanitiseName) {
ASSERT_EQ(SanitiseName("+_+ "), "_");
ASSERT_EQ(SanitiseName("input+"), "input_");
ASSERT_EQ(SanitiseName("input-"), "input_");
ASSERT_EQ(SanitiseName("input++"), "input_");
ASSERT_EQ(SanitiseName("woof:1"), "woof_1");
EXPECT_THROW(SanitiseName(""), InternalError);
TEST(NameTransforms, SanitizeName) {
ASSERT_EQ(SanitizeName("+_+ "), "_");
ASSERT_EQ(SanitizeName("input+"), "input_");
ASSERT_EQ(SanitizeName("input-"), "input_");
ASSERT_EQ(SanitizeName("input++"), "input_");
ASSERT_EQ(SanitizeName("woof:1"), "woof_1");
EXPECT_THROW(SanitizeName(""), InternalError);
}

TEST(NameTransforms, CombinedLogic) {
Expand Down
16 changes: 8 additions & 8 deletions tests/python/relay/test_name_transforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
to_c_variable_style,
prefix_name,
prefix_generated_name,
sanitise_name,
sanitize_name,
)
import pytest

Expand Down Expand Up @@ -80,15 +80,15 @@ def test_prefix_generated_name():
prefix_generated_name([""])


def test_sanitise_name():
assert sanitise_name("+_+ ") == "_"
assert sanitise_name("input+") == "input_"
assert sanitise_name("input-") == "input_"
assert sanitise_name("input++") == "input_"
assert sanitise_name("woof:1") == "woof_1"
def test_sanitize_name():
assert sanitize_name("+_+ ") == "_"
assert sanitize_name("input+") == "input_"
assert sanitize_name("input-") == "input_"
assert sanitize_name("input++") == "input_"
assert sanitize_name("woof:1") == "woof_1"

with pytest.raises(TVMError, match="Name is empty"):
sanitise_name("")
sanitize_name("")


def test_combined_logic():
Expand Down