Skip to content

Commit

Permalink
Fix compilation warnings with icc
Browse files Browse the repository at this point in the history
  • Loading branch information
mtaillefumier authored and oschuett committed Jan 5, 2021
1 parent 4bd7640 commit b13ea50
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
5 changes: 3 additions & 2 deletions src/grid/cpu/cpu_private_header.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "../common/grid_basis_set.h"
#include "../common/grid_buffer.h"
#include "../common/grid_common.h"

#include "../common/grid_constants.h"
enum checksum_ { task_checksum = 0x2384989, ctx_checksum = 0x2356734 };

typedef struct {
Expand Down Expand Up @@ -154,7 +154,8 @@ extern void set_grid_parameters(

extern void collocate_one_grid_level_dgemm(grid_context *const ctx,
const int *const, const int *const,
const int func, const int level,
const enum grid_func func,
const int level,
const grid_buffer *pab_blocks);

extern void integrate_one_grid_level_dgemm(
Expand Down
6 changes: 3 additions & 3 deletions src/grid/cpu/grid_collocate_dgemm.c
Original file line number Diff line number Diff line change
Expand Up @@ -864,8 +864,8 @@ void grid_collocate_pgf_product_cpu_dgemm(
const double rab2 = rab[0] * rab[0] + rab[1] * rab[1] + rab[2] * rab[2];
const double prefactor = rscale * exp(-zeta * f * rab2);
const double zeta_pair[2] = {zeta, zetb};
initialize_basis_vectors(handler, dh, dh_inv);
verify_orthogonality(dh, handler->orthogonal);
initialize_basis_vectors(handler, (const double(*)[3])dh, dh_inv);
verify_orthogonality((const double(*)[3])dh, handler->orthogonal);

initialize_tensor_3(&(handler->grid), grid_local_size[2], grid_local_size[1],
grid_local_size[0]);
Expand Down Expand Up @@ -1065,7 +1065,7 @@ void compute_coefficients(grid_context *const ctx,
void collocate_one_grid_level_dgemm(grid_context *const ctx,
const int *const border_width,
const int *const shift_local,
const int func, const int level,
const enum grid_func func, const int level,
const grid_buffer *pab_blocks) {
tensor *const grid = &ctx->grid[level];
// Using default(shared) because with GCC 9 the behavior around const changed:
Expand Down
12 changes: 6 additions & 6 deletions src/grid/cpu/grid_context_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "utils.h"

void return_dh(void *const ptr, const int level, double *const dh) {
grid_context *const ctx = (grid_context *const)ptr;
grid_context *const ctx = (grid_context *)ptr;

assert(ctx->checksum == ctx_checksum);
dh[0] = ctx->grid[level].dh[0][0];
Expand All @@ -36,7 +36,7 @@ void return_dh(void *const ptr, const int level, double *const dh) {
}

void return_dh_inv(void *const ptr, const int level, double *const dh_inv) {
grid_context *const ctx = (grid_context *const)ptr;
grid_context *const ctx = (grid_context *)ptr;

assert(ctx->checksum == ctx_checksum);
dh_inv[0] = ctx->grid[level].dh_inv[0][0];
Expand All @@ -51,27 +51,27 @@ void return_dh_inv(void *const ptr, const int level, double *const dh_inv) {
}

int return_num_devs(void *const ptr) {
grid_context *const ctx = (grid_context *const)ptr;
grid_context *const ctx = (grid_context *)ptr;
assert(ctx->checksum == ctx_checksum);

return ctx->number_of_devices;
}

int return_device_id(void *const ptr, const int device) {
grid_context *const ctx = (grid_context *const)ptr;
grid_context *const ctx = (grid_context *)ptr;
assert(ctx->checksum == ctx_checksum);

return ctx->device_id[device];
}

int is_grid_orthorhombic(void *const ptr) {
grid_context *const ctx = (grid_context *const)ptr;
grid_context *const ctx = (grid_context *)ptr;
assert(ctx->checksum == ctx_checksum);
return ctx->orthorhombic;
}

void update_queue_length(void *const ptr, const int queue_length) {
grid_context *const ctx = (grid_context *const)ptr;
grid_context *const ctx = (grid_context *)ptr;
assert(ctx->checksum == ctx_checksum);
ctx->queue_length = queue_length;
}
Expand Down
5 changes: 2 additions & 3 deletions src/grid/hybrid/grid_collocate_hybrid.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,7 @@ static void collocate_one_grid_level_gpu(grid_context *const ctx,
handler->func = func;
grid_prepare_get_ldiffs_dgemm(handler->func, handler->lmin_diff,
handler->lmax_diff);
initialize_basis_vectors(handler, (const double(*)[3])grid->dh,
(const double(*)[3])grid->dh_inv);
initialize_basis_vectors(handler, grid->dh, grid->dh_inv);

handler->apply_cutoff = ctx->apply_cutoff;

Expand Down Expand Up @@ -504,7 +503,7 @@ void grid_hybrid_collocate_task_list(
* implementation. */
for (int level = 0; level < ctx->nlevels; level++) {
bool orthogonal[3];
verify_orthogonality(dh[level], orthogonal);
verify_orthogonality((const double(*)[3])dh[level], orthogonal);
if (orthogonal[0] && orthogonal[1] && orthogonal[2] && (!ctx->orthorhombic))
ctx->orthorhombic = true;
else
Expand Down

0 comments on commit b13ea50

Please sign in to comment.