Skip to content

Rename the conflicting variables #73356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 18, 2025
Merged

Rename the conflicting variables #73356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d2c6e2d
fix major and minor redefined bug
YqGe585 Jun 16, 2025
d4cdcca
fix custom_device.cc
YqGe585 Jun 16, 2025
5fdd94b
modified camel case
YqGe585 Jun 17, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions paddle/fluid/pybind/pybind.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2937,9 +2937,9 @@ All parameter, weight, gradient are variables in Paddle.
.def_property_readonly(
"name", [](const phi::DeviceProp &prop) { return prop.name; })
.def_property_readonly(
"major", [](const phi::DeviceProp &prop) { return prop.major; })
"major", [](const phi::DeviceProp &prop) { return prop.deviceMajor; })
.def_property_readonly(
"minor", [](const phi::DeviceProp &prop) { return prop.minor; })
"minor", [](const phi::DeviceProp &prop) { return prop.deviceMinor; })
.def_property_readonly(
"total_memory",
[](const phi::DeviceProp &prop) { return prop.totalGlobalMem; })
Expand All @@ -2955,7 +2955,8 @@ All parameter, weight, gradient are variables in Paddle.
.def("__repr__", [](const phi::DeviceProp &prop) {
std::stringstream ostr;
ostr << "_customDeviceProperties(name='" << prop.name
<< "', major=" << prop.major << ", minor=" << prop.minor
<< "', major=" << prop.deviceMajor
<< ", minor=" << prop.deviceMinor
<< ", total_memory=" << prop.totalGlobalMem / (1024 * 1024)
<< "MB, multi_processor_count=" << prop.multiProcessorCount << ")";
return ostr.str();
Expand Down
3 changes: 2 additions & 1 deletion paddle/phi/backends/custom/custom_device.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,8 @@ class CustomDevice : public DeviceInterface {
}
VLOG(10) << Type() << " get device properties"
<< "DeviceProperties(name='" << prop.name
<< "', major=" << prop.major << ", minor=" << prop.minor
<< "', major=" << prop.deviceMajor
<< ", minor=" << prop.deviceMajor
<< ", total_memory=" << prop.totalGlobalMem / (1024 * 1024)
<< "MB, multi_processor_count=" << prop.multiProcessorCount << ")";
return prop;
Expand Down
12 changes: 6 additions & 6 deletions paddle/phi/backends/device_base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ namespace phi {

struct DeviceProp {
std::string name;
int major = 0;
int minor = 0;
int deviceMajor = 0;
int deviceMinor = 0;
size_t totalGlobalMem = 0;
int multiProcessorCount = 0;
bool isMultiGpuBoard = false;
Expand All @@ -35,15 +35,15 @@ struct DeviceProp {
DeviceProp() = default;

DeviceProp(const std::string& name_,
int major_,
int minor_,
int deviceMajor_,
int deviceMinor_,
size_t totalGlobalMem_,
int multiProcessorCount_,
bool isMultiGpuBoard_,
bool integrated_)
: name(name_),
major(major_),
minor(minor_),
deviceMajor(deviceMajor_),
deviceMinor(deviceMinor_),
totalGlobalMem(totalGlobalMem_),
multiProcessorCount(multiProcessorCount_),
isMultiGpuBoard(isMultiGpuBoard_),
Expand Down
Loading