dtof change 1
This commit is contained in:
@@ -58,7 +58,7 @@ tval3_options* getOptions(const TVALOptions& opt){
|
||||
return optso;
|
||||
}
|
||||
|
||||
sparse_mat_host *getSparseMatrix(int* xIdxs, int* yIdxs, double * mValues,size_t mM, size_t mN, int nz, bool pagelocked) {
|
||||
sparse_mat_host *getSparseMatrix(int* xIdxs, int* yIdxs, float * mValues,size_t mM, size_t mN, int nz, bool pagelocked) {
|
||||
|
||||
size_t dim_y = mM;
|
||||
size_t dim_x = mN;
|
||||
@@ -66,7 +66,7 @@ sparse_mat_host *getSparseMatrix(int* xIdxs, int* yIdxs, double * mValues,size_t
|
||||
int *mi_columnIndex = yIdxs;
|
||||
int n_nonzero = nz;
|
||||
|
||||
double *mi_data = mValues;
|
||||
float *mi_data = mValues;
|
||||
|
||||
sparse_mat_host *mo = new sparse_mat_host(dim_y, dim_x, n_nonzero,
|
||||
sparse_mat_csc, false, pagelocked, cudaHostAllocWriteCombined);
|
||||
@@ -76,13 +76,13 @@ sparse_mat_host *getSparseMatrix(int* xIdxs, int* yIdxs, double * mValues,size_t
|
||||
|
||||
for(int i=0; i < mo->nnz; i++) {
|
||||
mo->ind()[i] = mi_dim_y[i];
|
||||
mo->val()[i] = (float)mi_data[i];
|
||||
mo->val()[i] = mi_data[i];
|
||||
}
|
||||
|
||||
return mo;
|
||||
}
|
||||
|
||||
TVALResult TVALGPU(int *xIdxs, int *yIdxs, double *mValues, size_t mM, size_t mN,
|
||||
TVALResult TVALGPU(int *xIdxs, int *yIdxs, float *mValues, size_t mM, size_t mN,
|
||||
int nz, float *bData, size_t *bDims, size_t *dims, const TVALOptions& opt,
|
||||
int device, bool pagelocked) {
|
||||
int ip = dims[0];
|
||||
@@ -108,12 +108,13 @@ TVALResult TVALGPU(int *xIdxs, int *yIdxs, double *mValues, size_t mM, size_t mN
|
||||
if(plb_b != NULL)
|
||||
HANDLE_ERROR(cudaHostUnregister(plb_b));
|
||||
|
||||
result.data = new double[mU.len];
|
||||
result.data = new float[mU.len];
|
||||
std::copy(mU.data(),mU.data()+mU.len,result.data);
|
||||
result.dims[0] = mU.dim_x;
|
||||
result.dims[1] = mU.dim_y;
|
||||
result.dims[2] = mU.dim_z;
|
||||
|
||||
|
||||
// if(info != NULL) *info = setInfo(ti_info);
|
||||
|
||||
delete mb;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "tvalstruct.h"
|
||||
|
||||
extern TVALResult TVALGPU(int *xIdxs, int *yIdxs, double *mValues, size_t mM, size_t mN,
|
||||
extern TVALResult TVALGPU(int *xIdxs, int *yIdxs, float *mValues, size_t mM, size_t mN,
|
||||
int nz, float *bData, size_t *bDims, size_t *dims, const TVALOptions& opt,
|
||||
int device, bool pagelocked) ;
|
||||
#endif // __TVAL3GPU3D_H__
|
||||
@@ -19,7 +19,7 @@ struct TVALOptions{
|
||||
|
||||
};
|
||||
struct TVALResult{
|
||||
double* data = nullptr;
|
||||
float* data = nullptr;
|
||||
int dims[3]{0};
|
||||
std::string errormsg;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user