Skip to content

Commit 6e82573

Browse files
committed
Fix CUDA linkage issues with bitstream
1 parent 25e9d74 commit 6e82573

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/cuda/interface.cu

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <iostream>
2-
#include "interface.h"
32
#include "../share/device.h"
43
#include "shared.cuh"
54
#include "error.cuh"
@@ -16,6 +15,7 @@
1615
#include "decode1.cuh"
1716
#include "decode2.cuh"
1817
#include "decode3.cuh"
18+
#include "interface.h"
1919

2020
zfp_bool
2121
zfp_internal_cuda_init(zfp_exec_params_cuda* params)

src/cuda/shared.cuh

+7-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,21 @@
44
// report throughput; set via CMake
55
// #define ZFP_WITH_CUDA_PROFILE 1
66

7+
// we need to know about bitstream, but we don't want duplicate symbols
8+
#ifndef inline_
9+
#define inline_ static inline
10+
#endif
11+
#include "zfp/bitstream.inl"
12+
#include "zfp.h"
13+
714
#include <cmath>
815
#include <cstdio>
9-
#include "zfp.h"
1016
#include "traits.cuh"
1117
#include "constants.cuh"
1218
#ifdef ZFP_WITH_CUDA_PROFILE
1319
#include "timer.cuh"
1420
#endif
1521

16-
// we need to know about bitstream, but we don't want duplicate symbols
17-
#ifndef inline_
18-
#define inline_ static inline
19-
#endif
20-
21-
#include "zfp/bitstream.inl"
22-
2322
// bit stream word/buffer type; granularity of stream I/O operations
2423
typedef unsigned long long Word;
2524

0 commit comments

Comments
 (0)