Commit 982ebdf

committed

Merge pull request #19 from jramapuram/hotfix/build

Hotfix/build

2 parents c5c9ba7 + 58c489e commit 982ebdfCopy full SHA for 982ebdf

File tree

+23

-7

lines changed

+23

-7

lines changed

Lines changed: 5 additions & 3 deletions

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,11 @@ struct Config {`
`48`	`48`	`glew_dir: String,`
`49`	`49`	`glfw_dir: String,`
`50`	`50`	`boost_dir: String,`
	`51`	`+`
	`52`	`+ // GPU backends`
`51`	`53`	`cuda_sdk: String,`
`52`	`54`	`opencl_sdk: String,`
	`55`	`+ sdk_lib_dir: String,`
`53`	`56`	`}`
`54`	`57`
`55`	`58`	`macro_rules! t {`
`@@ -348,16 +351,16 @@ fn blob_backends(conf: &Config, build_dir: &std::path::PathBuf) -> (Vec<String>,`
`348`	`351`	`backend_dirs.push(format!("{}\\lib\\x64", conf.cuda_sdk));`
`349`	`352`	`backend_dirs.push(format!("{}\\nvvm\\lib\\x64", conf.cuda_sdk));`
`350`	`353`	`} else {`
`351`		`- backend_dirs.push(format!("{}/lib64", conf.cuda_sdk));`
`352`		`- backend_dirs.push(format!("{}/nvvm/lib64", conf.cuda_sdk));`
	`354`	`+ backend_dirs.push(format!("{}/{}", conf.cuda_sdk, conf.sdk_lib_dir));`
	`355`	`+ backend_dirs.push(format!("{}/nvvm/{}", conf.cuda_sdk, conf.sdk_lib_dir));`
`353`	`356`	`}`
`354`	`357`	`} else if conf.use_backend == "opencl" {`
`355`	`358`	`backends.push(("afopencl".to_string()));`
`356`	`359`	`backends.push("OpenCL".to_string());`
`357`	`360`	`if cfg!(windows) {`
`358`	`361`	`backend_dirs.push(format!("{}\\lib\\x64", conf.opencl_sdk));`
`359`	`362`	`} else {`
`360`		`- backend_dirs.push(format!("{}/lib64", conf.opencl_sdk));`
	`363`	`+ backend_dirs.push(format!("{}/{}", conf.opencl_sdk, conf.sdk_lib_dir));`
`361`	`364`	`}`
`362`	`365`	`}`
`363`	`366`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,18 @@ impl ConstGenerator for Complex<f64> {`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`
	`117`	`+#[allow(unused_mut)]`
	`118`	`+impl ConstGenerator for bool {`
	`119`	`+ fn generate(&self, dims: Dim4) -> Array {`
	`120`	`+ unsafe {`
	`121`	`+ let mut temp: i64 = 0;`
	`122`	`+ af_constant(&mut temp as MutAfArray, *self as c_int as c_double,`
	`123`	`+ dims.ndims() as c_uint, dims.get().as_ptr() as *const DimT, 4);`
	`124`	`+ Array::from(temp)`
	`125`	`+ }`
	`126`	`+ }`
	`127`	`+}`
	`128`	`+`
`117`	`129`	`macro_rules! cnst {`
`118`	`130`	`($rust_type:ty, $ffi_type:expr) => (`
`119`	`131`	`#[allow(unused_mut)]`
`@@ -133,7 +145,6 @@ macro_rules! cnst {`
`133`	`145`
`134`	`146`	`cnst!(f32 , 0);`
`135`	`147`	`cnst!(f64 , 2);`
`136`		`-cnst!(bool, 4);`
`137`	`148`	`cnst!(i32 , 5);`
`138`	`149`	`cnst!(u32 , 6);`
`139`	`150`	`cnst!(u8 , 7);`

Comments

(0)