Skip to content

Commit 1893747

Browse files
committed
update README and INSTALL
1 parent 1dc509c commit 1893747

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

INSTALL.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ Ginkgo adds the following additional switches to control what is being built:
8181
this option see the
8282
[`ARCHITECTURES` specification list](https://github.com/ginkgo-project/CudaArchitectureSelector/blob/master/CudaArchitectureSelector.cmake#L58)
8383
section in the documentation of the CudaArchitectureSelector CMake module.
84+
* `-DGINKGO_WINDOWS_SHARED_LIBRARY_RELPATH=<path>` where <path> is a relative
85+
path with `PROJECT_BINARY_DIR`. Users must to add the absoulte path
86+
(`PROJECT_BINARY_DIR`/`GINKGO_WINDOWS_SHARED_LIBRARY_RELPATH`) into the
87+
environment variable PATH when building shared libraries and executable
88+
program, default is `windows_shared_library`.
89+
* `-DGINKGO_CHECK_PATH={ON, OFF}` checks the environment variable PATH is valid.
90+
It is valid only when building shared libraries and executable program,
91+
default is `ON`
8492

8593
For example, to build everything (in debug mode), use:
8694

README.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,21 @@ following:
5454

5555
### Windows
5656

57-
Windows is currently not supported, but we are working on porting the library
58-
there. If you are interested in helping us with this effort, feel free to
59-
contact one of the developers. (The library itself doesn't use any non-standard
60-
C++ features, so most of the effort here is in modifying the build system.)
57+
The prequirement needs to be verified
58+
* _cmake 3.9+_
59+
* C++11 compliant 64-bits compiler:
60+
* _MinGW : gcc 5.3+, 6.3+, 7.3+, 8.1+_
61+
* _CygWin : gcc 5.3+, 6.3+, 7.3+, 8.1+_
62+
* _Microsoft Visual Studio : VS 2017 15.7+_
63+
64+
The Ginkgo CUDA module has the following __additional__ requirements:
65+
66+
* _CUDA 9.0+_
67+
* _Microsoft Visual Stutio_
68+
* Any host compiler restrictions your version of CUDA may impose also apply
69+
here. For the newest CUDA version, this information can be found in the
70+
[CUDA installation guide for Windows](https://docs.nvidia.com/cuda/cuda-installation-guide-microsoft-windows/index.html)
71+
6172

6273
__NOTE:__ Some restrictions will also apply on the version of C and C++ standard
6374
libraries installed on the system. This needs further investigation.

cuda/base/math.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,11 @@ __device__ GKO_INLINE std::complex<double> one<std::complex<double>>()
9999
// as a __device__ function, so it results in a compiler error.
100100
// Here, `isfinite` is written by hand, which might not be as performant as the
101101
// intrinsic function from CUDA, but it compiles and works.
102-
#if defined(__CUDA_ARCH__) && (defined(_MSC_VER) || \
103-
(defined(__CUDACC_VER_MAJOR__) && defined(__CUDACC_VER_MINOR__) && \
104-
(__CUDACC_VER_MAJOR__ * 1000 + __CUDACC_VER_MINOR__) < 9002 && \
105-
(defined(__clang__) || defined(__ICC) || defined(__ICL))))
102+
#if defined(__CUDA_ARCH__) && \
103+
(defined(_MSC_VER) || \
104+
(defined(__CUDACC_VER_MAJOR__) && defined(__CUDACC_VER_MINOR__) && \
105+
(__CUDACC_VER_MAJOR__ * 1000 + __CUDACC_VER_MINOR__) < 9002 && \
106+
(defined(__clang__) || defined(__ICC) || defined(__ICL))))
106107

107108

108109
namespace detail {

reference/test/matrix/hybrid_kernels.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class Hybrid : public ::testing::Test {
9696
auto v = m->get_const_values();
9797
auto c = m->get_const_col_idxs();
9898
auto r = m->get_const_row_ptrs();
99-
99+
100100
ASSERT_EQ(m->get_size(), gko::dim<2>(2, 3));
101101
ASSERT_EQ(m->get_num_stored_elements(), 4);
102102
EXPECT_EQ(r[0], 0);

0 commit comments

Comments
 (0)