Skip to content
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.

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

PCIe topology detection #39

Merged
merged 7 commits into from
Mar 31, 2019
Merged

PCIe topology detection #39

merged 7 commits into from
Mar 31, 2019

Conversation

philipheinisch
Copy link
Member

Added automatic PCIe detection and matching between OpenCL and NVML for NVidia devices to solve #38

@philipheinisch philipheinisch requested a review from ranocha March 29, 2019 13:33
Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please revert all the indentation changes (and changes to hdf5_io.cpp)? All these changes inserting tabs instead of spaces make it really hard to review the new code.

src/hdf5_io.cpp Outdated Show resolved Hide resolved
src/ocl_dev_mgr.cpp Outdated Show resolved Hide resolved
@ranocha
Copy link
Member

ranocha commented Mar 29, 2019

You've also reverted the changes to main.cpp. That's the reason for the failing tests (parsing test).

@philipheinisch
Copy link
Member Author

Is there still something missing or can this be merged now?

Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are still lots of indentation changes in src/ocl_dev_mgr.cpp - didn't you want to revert these?

}
std::string compile_options = std::string(" ") + std::string(options);

try {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here are some indentation errors.

src/main.cpp Show resolved Hide resolved
src/main.cpp Show resolved Hide resolved
src/main.cpp Show resolved Hide resolved
src/main.cpp Show resolved Hide resolved
nvidia_temp.clear();
nvidia_temp_time.clear();
void nvidia_log_temp_func() {
if (nvidia_temp_rate > 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we want to use 2 spaces instead of 4?

Copy link
Member

@ranocha ranocha left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While there are some parts I would like to change, this PR seems to work on my system. We can merge them after some cleanup.

src/ocl_dev_mgr.cpp Outdated Show resolved Hide resolved
src/main.cpp Outdated Show resolved Hide resolved

try {
cl_prog.build(compile_options.c_str());
cl_prog.build(compile_options.c_str());
}
catch (cl::BuildError error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tabs 😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😖

@philipheinisch
Copy link
Member Author

So we just merge this PR and then do a second debug mode PR?

@ranocha ranocha merged commit e6da7b1 into IANW-Projects:master Mar 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants