Skip to content

cliconfig improvements #485

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

Open
bashbaug wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cliconfig improvements #485

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
109 changes: 57 additions & 52 deletions cliconfig/CLIConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ BOOL CAboutPage::OnInitDialog()

CComboBox* pPlatformComboBox = (CComboBox*)GetDlgItem(IDC_PLATFORM_LIST);

HMODULE hModule = ::LoadLibraryA( "opencl.dll" );
HMODULE hModule = ::LoadLibraryExA( "opencl.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32 );
if( hModule )
{
pfnGetPlatformIDs dclGetPlatformIDs = (pfnGetPlatformIDs)::GetProcAddress( hModule, "clGetPlatformIDs" );
Expand Down Expand Up @@ -687,6 +687,10 @@ BOOL CAboutPage::OnInitDialog()

::FreeLibrary( hModule );
}
else
{
pPlatformComboBox->AddString(L"Could not load OpenCL ICD loader!");
}

pPlatformComboBox->SetCurSel(0);

Expand Down Expand Up @@ -780,16 +784,13 @@ void CAboutPage::OnPlatformListChange()
CComboBox* pPlatformComboBox = (CComboBox*)GetDlgItem(IDC_PLATFORM_LIST);
CComboBox* pDeviceComboBox = (CComboBox*)GetDlgItem(IDC_DEVICE_LIST);

// First, delete any existing strings in the device list.
for( int i = pDeviceComboBox->GetCount() - 1; i >= 0; i-- )
{
pDeviceComboBox->DeleteString( i );
}
// First, delete any existing strings in the device info list.
pDeviceComboBox->ResetContent();

// Get the currently selected platform index.
cl_uint platformIndex = pPlatformComboBox->GetCurSel();

HMODULE hModule = ::LoadLibraryA( "opencl.dll" );
HMODULE hModule = ::LoadLibraryExA( "opencl.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32 );
if( hModule )
{
pfnGetDeviceIDs dclGetDeviceIDs = (pfnGetDeviceIDs)::GetProcAddress( hModule, "clGetDeviceIDs" );
Expand Down Expand Up @@ -817,7 +818,7 @@ void CAboutPage::OnPlatformListChange()
}
else
{
pDeviceComboBox->AddString(L"No OpenCL platforms detected!");
pDeviceComboBox->AddString(L"Unexpected error getting device IDs!");
}

m_Devices.resize( numDevices );
Expand Down Expand Up @@ -854,6 +855,10 @@ void CAboutPage::OnPlatformListChange()

::FreeLibrary( hModule );
}
else
{
pDeviceComboBox->AddString(L"Could not load OpenCL ICD loader!");
}

pDeviceComboBox->SetCurSel(0);

Expand All @@ -866,62 +871,62 @@ void CAboutPage::OnDeviceListChange()
CListBox* pDeviceInfoList = (CListBox*)GetDlgItem(IDC_DEVICE_INFO);

// First, delete any existing strings in the device info list.
for( int i = pDeviceInfoList->GetCount() - 1; i >= 0; i-- )
{
pDeviceInfoList->DeleteString( i );
}
pDeviceInfoList->ResetContent();

// Get the currently selected device index.
cl_uint deviceIndex = pDeviceComboBox->GetCurSel();
if( deviceIndex < m_Devices.size() )

HMODULE hModule = ::LoadLibraryExA( "opencl.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32 );
if( hModule )
{
HMODULE hModule = ::LoadLibraryA( "opencl.dll" );
if( hModule )
{
pfnGetDeviceInfo dclGetDeviceInfo = (pfnGetDeviceInfo)::GetProcAddress( hModule, "clGetDeviceInfo" );
pfnGetDeviceInfo dclGetDeviceInfo = (pfnGetDeviceInfo)::GetProcAddress( hModule, "clGetDeviceInfo" );

cl_int errorCode = CL_SUCCESS;
cl_int errorCode = CL_SUCCESS;

if( dclGetDeviceInfo )
if( errorCode == CL_SUCCESS &&
dclGetDeviceInfo &&
deviceIndex < m_Devices.size() )
{
std::vector<char> vendor;
errorCode |= GetDeviceInfoString(
dclGetDeviceInfo,
m_Devices[deviceIndex],
CL_DEVICE_VENDOR,
vendor );
std::vector<char> version;
errorCode |= GetDeviceInfoString(
dclGetDeviceInfo,
m_Devices[deviceIndex],
CL_DEVICE_VERSION,
version );
std::vector<char> driverVersion;
errorCode |= GetDeviceInfoString(
dclGetDeviceInfo,
m_Devices[deviceIndex],
CL_DRIVER_VERSION,
driverVersion );

if( errorCode == CL_SUCCESS )
{
std::vector<char> vendor;
errorCode |= GetDeviceInfoString(
dclGetDeviceInfo,
m_Devices[deviceIndex],
CL_DEVICE_VENDOR,
vendor );
std::vector<char> version;
errorCode |= GetDeviceInfoString(
dclGetDeviceInfo,
m_Devices[deviceIndex],
CL_DEVICE_VERSION,
version );
std::vector<char> driverVersion;
errorCode |= GetDeviceInfoString(
dclGetDeviceInfo,
m_Devices[deviceIndex],
CL_DRIVER_VERSION,
driverVersion );

if( errorCode == CL_SUCCESS )
{
int n = 0;
pDeviceInfoList->InsertString(n++, ToWString(vendor).c_str() );
pDeviceInfoList->InsertString(n++, ToWString(version).c_str() );
pDeviceInfoList->InsertString(n++, ToWString(driverVersion).c_str() );
}
else
{
pDeviceInfoList->InsertString(0, L"Error getting device info!");
}
pDeviceInfoList->AddString(ToWString(vendor).c_str());
pDeviceInfoList->AddString(ToWString(version).c_str());
pDeviceInfoList->AddString(ToWString(driverVersion).c_str());
}
else
{
pDeviceInfoList->InsertString(0, L"Error getting device info function pointer!");
pDeviceInfoList->AddString(L"Error getting device info!");
}

::FreeLibrary( hModule );
}
else
{
pDeviceInfoList->AddString(L"Unexpected error getting device info!");
}

::FreeLibrary( hModule );
}
else
{
pDeviceInfoList->AddString(L"Could not load OpenCL ICD loader!");
}
}

Expand Down
Loading