Fixed closing comments on cuda file headers; reversed Allwmake logic

This commit is contained in:
Dominik Christ 2014-02-17 11:12:51 +00:00
parent 83767105da
commit fbbfe1f59d
8 changed files with 62 additions and 86 deletions

View file

@ -1,14 +1,14 @@
#!/bin/sh
#!/bin/bash
cd ${0%/*} || exit 1 # run from this directory
if [ -f $CUDA_BIN_DIR/nvcc ]
then
if [ -z $CUDA_IGNORE ]
then
echo "Found nvcc but \$CUDA_IGNORE set -- not enabling CUDA support."
else
echo "Found nvcc -- enabling CUDA support."
wmake libso
else
echo "Found nvcc but \$CUDA_IGNORE set -- not enabling CUDA support."
fi
else
echo "No nvcc - CUDA not available."

View file

@ -32,21 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA™ based solver.
\**********************************************************************/
#include "cudaTypes.H"

View file

@ -32,21 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA™ based solver.
\**********************************************************************/
#include "cudaTypes.H"

View file

@ -32,21 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA™ based solver.
\**********************************************************************/
#include "cudaTypes.H"

View file

@ -32,20 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA™ based solver.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
\**********************************************************************/
#include "cudaTypes.H"

View file

@ -32,20 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA™ based solver.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
\**********************************************************************/
#include "cudaTypes.H"

View file

@ -12,7 +12,7 @@ cufflink is a library for linking numerical methods based on Nvidia's
Compute Unified Device Architecture (CUDA) C/C++ programming language
and OpenFOAM®.
Please note that cufflink is not approved or endorsed by OpenCFD®
Please note that cufflink is not approved or endorsed by ESI-OpenCFD®
Limited, the owner of the OpenFOAM® and OpenCFD® trademarks and
producer of OpenFOAM® software.
@ -32,20 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA based solver.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
\**********************************************************************/
// Build the normfactor as foam-extend does in file

View file

@ -9,10 +9,10 @@
Cuda For FOAM Link
cufflink is a library for linking numerical methods based on Nvidia's
Compute Unified Device Architecture (CUDA) C/C + + programming language
Compute Unified Device Architecture (CUDA) C/C++ programming language
and OpenFOAM®.
Please note that cufflink is not approved or endorsed by OpenCFD®
Please note that cufflink is not approved or endorsed by ESI-OpenCFD®
Limited, the owner of the OpenFOAM® and OpenCFD® trademarks and
producer of OpenFOAM® software.
@ -32,20 +32,17 @@ This file is part of cufflink.
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
This file is part of foam-extend.
along with cufflink. If not, see <http://www.gnu.org/licenses/>.
foam-extend is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation, either version 3 of the License, or (at your
option) any later version.
Author
Daniel P. Combest. All rights reserved.
Modifications by Dominik Christ, Wikki Ltd.
foam-extend is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
Description
diagonal preconditioned conjugate gradient
solver for symmetric Matrices using a CUSP CUDA based solver.
You should have received a copy of the GNU General Public License
along with foam-extend. If not, see <http://www.gnu.org/licenses/>.
\**********************************************************************/
// Fill in the rest of the diag (rows and col),
// upper and upper.rows and upper.cols