Skip to content

Commit

Permalink
FIX: correct include path in Quick-start guide
Browse files Browse the repository at this point in the history
thanks to Raul Miguelanez
  • Loading branch information
mwiesenberger committed Jan 7, 2020
1 parent b0f4c6a commit 94e4ac1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,11 @@ int main()
}
----

To compile and run this code for a GPU use
To compile and run this code for a GPU use (assuming the external libraries are linked in the `include` folder as described above)

[source,sh]
----
nvcc -x cu -std=c++11 -Ipath/to/feltor/inc -Ipath/to/thrust/thrust -Ipath/to/cusplibrary/cusp test.cpp -o test
nvcc -x cu -std=c++11 -Ipath/to/feltor/inc -Ipath/to/include test.cpp -o test
./test
----

Expand All @@ -208,7 +208,7 @@ functions you can also use

[source,sh]
----
g++ -std=c++11 -fopenmp -mavx -mfma -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP -Ipath/to/feltor/inc -Ipath/to/thrust/thrust -Ipath/to/cusplibrary/cusp test.cpp -o test
g++ -std=c++11 -fopenmp -mavx -mfma -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP -Ipath/to/feltor/inc -Ipath/to/include test.cpp -o test
export OMP_NUM_THREADS=4
./test
----
Expand Down Expand Up @@ -251,7 +251,7 @@ Compile e.g. for a hybrid MPI {plus} OpenMP hardware platform with

[source,sh]
----
mpic++ -std=c++11 -mavx -mfma -fopenmp -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP -Ipath/to/feltor/inc -Ipath/to/thrust/thrust -Ipath/to/cusplibrary/cusp test_mpi.cpp -o test_mpi
mpic++ -std=c++11 -mavx -mfma -fopenmp -DTHRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_OMP -Ipath/to/feltor/inc -Ipath/to/include test_mpi.cpp -o test_mpi
export OMP_NUM_THREADS=2
mpirun -n 4 ./test_mpi
----
Expand Down
2 changes: 1 addition & 1 deletion inc/dg/blas1_t.cu
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ int main()
dg::blas1::pointwiseDot( 2., w1, w2, -4., w1, w2, 0., w2);
std::cout << "2*2*3 -4*2*3 = "<<w2[0][0]<<" (-12)\n";
dg::blas1::axpby( 2., w1, 3., w2);
std::cout << "2*2+ 3*3 = " << w2[0][0] <<" (13)\n";
std::cout << "2*2+ 3*(-12) = " << w2[0][0] <<" (-32)\n";
dg::blas1::axpby( 2.5, w1, 0., w2);
std::cout << "2.5*2+ 0 = " << w2[0][0] <<" (5)\n";
dg::blas1::axpbypgz( 2.5, w1, 2., w2, -0.125, w3);
Expand Down

0 comments on commit 94e4ac1

Please sign in to comment.