Trying to fix stuff for windows.
This commit is contained in:
@@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"devices": [
|
|
||||||
{
|
|
||||||
"dev_name": "gfx1103",
|
|
||||||
"platform_name": "AMD Accelerated Parallel Processing",
|
|
||||||
"id": 0,
|
|
||||||
"work_size": 4096,
|
|
||||||
"batch_size": 5412812
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"dev_fill": 100
|
|
||||||
}
|
|
||||||
@@ -25,7 +25,7 @@ pub mod ocl_utils;
|
|||||||
mod search_params;
|
mod search_params;
|
||||||
//mod test_cl;
|
//mod test_cl;
|
||||||
|
|
||||||
const S_ADDR: &str = "http://127.0.0.1:37939";
|
const S_ADDR: &str = "http://93.113.25.180:37939";
|
||||||
// const SRC_PATH: &str = "src/open_cl/nyash_aes_xts256_plain.cl";
|
// const SRC_PATH: &str = "src/open_cl/nyash_aes_xts256_plain.cl";
|
||||||
// const OCL_COMP_OPT: &str = "-I src/open_cl";
|
// const OCL_COMP_OPT: &str = "-I src/open_cl";
|
||||||
const CONF_RILE_NAME: &str = "nyash_conf.json";
|
const CONF_RILE_NAME: &str = "nyash_conf.json";
|
||||||
|
|||||||
@@ -63,14 +63,16 @@ impl AppConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn load_config(file_name: &str) -> Result<AppConfig, Box<dyn Error>> {
|
pub fn load_config(file_name: &str) -> Result<AppConfig, Box<dyn Error>> {
|
||||||
let file_data = std::fs::read_to_string(file_name)?;
|
let file_path = std::path::Path::new(file_name);
|
||||||
|
let file_data = std::fs::read_to_string(file_path)?;
|
||||||
let app_conf: AppConfig = serde_json::from_str(file_data.as_str())?;
|
let app_conf: AppConfig = serde_json::from_str(file_data.as_str())?;
|
||||||
return Ok(app_conf);
|
return Ok(app_conf);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn save_config(file_name: &str, app_conf: &AppConfig) -> Result<(), Box<dyn Error>> {
|
pub fn save_config(file_name: &str, app_conf: &AppConfig) -> Result<(), Box<dyn Error>> {
|
||||||
|
let file_path = std::path::Path::new(file_name);
|
||||||
let conf_str = serde_json::to_string_pretty(app_conf)?;
|
let conf_str = serde_json::to_string_pretty(app_conf)?;
|
||||||
std::fs::write(file_name, conf_str)?;
|
std::fs::write(file_path, conf_str)?;
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,7 +157,7 @@ fn dev_sel_dialog(all_devices: &Vec<(Device, Platform)>) -> Vec<usize> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_devices_conf(file_name: &str) -> Result<(Vec<(Device, Platform)>, AppConfig), String> {
|
pub fn get_devices_conf(file_name: &str) -> Result<(Vec<(Device, Platform)>, AppConfig), String> {
|
||||||
let dev_type = dev_type_from_str("GPU").expect("Unexpected device type!");
|
let dev_type = dev_type_from_str("ALL").expect("Unexpected device type!");
|
||||||
|
|
||||||
// Get devices to be used for key search
|
// Get devices to be used for key search
|
||||||
let all_devices: Vec<(Device, Platform)> = list_devices(dev_type);
|
let all_devices: Vec<(Device, Platform)> = list_devices(dev_type);
|
||||||
|
|||||||
Reference in New Issue
Block a user