zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revocap-refiner: add space and remove unused function. (#16861)

Browse Source
This commit is contained in:
noguchi-k 2020-05-31 00:57:12 +09:00 committed by GitHub
parent 7a363e2a3f
commit 816f780be8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
var/spack/repos/builtin/packages/revocap-refiner/add_space.patch Normal file
View File

@ -0,0 +1,37 @@
--- spack-src/Common/kmbDebug.h.org 2020-05-26 14:12:24.977659640 +0900
+++ spack-src/Common/kmbDebug.h 2020-05-26 14:15:11.118470571 +0900
@@ -52,29 +52,29 @@
#define REVOCAP_Debug_X(format)
#else
/* _DEBUG マクロに関係なく出力 */
- #define REVOCAP_Debug_X(fmt, ...) fprintf(stderr,"%s, line %d: "fmt,__FILE__,__LINE__, ##__VA_ARGS__)
+ #define REVOCAP_Debug_X(fmt, ...) fprintf(stderr,"%s, line %d: " fmt,__FILE__,__LINE__, ##__VA_ARGS__)
#if defined _DEBUG || _DEBUG_
#include <cstdio>
- #define REVOCAP_Debug(fmt, ...) fprintf(stderr,"%s, line %d: "fmt,__FILE__,__LINE__, ##__VA_ARGS__)
+ #define REVOCAP_Debug_X(fmt, ...) fprintf(stderr,"%s, line %d: " fmt,__FILE__,__LINE__, ##__VA_ARGS__)
#else
#define REVOCAP_Debug(format, ...)
#endif
#if ( _DEBUG >= 1 ) || ( _DEBUG_ >= 1 )
- #define REVOCAP_Debug_1(fmt, ...) fprintf(stderr,"%s, line %d: "fmt,__FILE__,__LINE__, ##__VA_ARGS__)
+ #define REVOCAP_Debug_X(fmt, ...) fprintf(stderr,"%s, line %d: " fmt,__FILE__,__LINE__, ##__VA_ARGS__)
#else
#define REVOCAP_Debug_1(format, ...)
#endif
#if ( _DEBUG >= 2 ) || ( _DEBUG_ >= 2 )
- #define REVOCAP_Debug_2(fmt, ...) fprintf(stderr,"%s, line %d: "fmt,__FILE__,__LINE__, ##__VA_ARGS__)
+ #define REVOCAP_Debug_X(fmt, ...) fprintf(stderr,"%s, line %d: " fmt,__FILE__,__LINE__, ##__VA_ARGS__)
#else
#define REVOCAP_Debug_2(format, ...)
#endif
#if ( _DEBUG >= 3 ) || ( _DEBUG_ >= 3 )
- #define REVOCAP_Debug_3(fmt, ...) fprintf(stderr,"%s, line %d: "fmt,__FILE__,__LINE__, ##__VA_ARGS__)
+ #define REVOCAP_Debug_X(fmt, ...) fprintf(stderr,"%s, line %d: " fmt,__FILE__,__LINE__, ##__VA_ARGS__)
#else
#define REVOCAP_Debug_3(format, ...)
#endif

28
var/spack/repos/builtin/packages/revocap-refiner/delete_getIndices.patch Normal file
View File

@ -0,0 +1,28 @@
--- spack-src/Geometry/kmbBucket.h.org 2020-05-28 11:42:08.438970353 +0900
+++ spack-src/Geometry/kmbBucket.h 2020-05-28 11:43:55.449496013 +0900
@@ -348,12 +348,6 @@
int getIndex() const{ return it->first; };
- void getIndices(int &i,int &j,int &k) const{
- i = it->first / (ynum*znum);
- j = (it->first - i*ynum*znum) / znum;
- k = it->first - i*ynum*znum - j*znum;
- };
-
iterator& operator++(void){ ++it; return *this; };
iterator operator++(int n){
@@ -391,12 +385,6 @@
int getIndex() const{ return it->first; };
- void getIndices(int &i,int &j,int &k) const{
- i = it->first / (ynum*znum);
- j = (it->first - i*ynum*znum) / znum;
- k = it->first - i*ynum*znum - j*znum;
- };
-
const_iterator& operator++(void){ ++it; return *this; };
const_iterator operator++(int n){

5
var/spack/repos/builtin/packages/revocap-refiner/package.py
View File

@ -22,6 +22,11 @@ class RevocapRefiner(MakefilePackage):
parallel = False
# add space between literal and identifier.
patch('add_space.patch')
# remove unused function getIndices.
patch('delete_getIndices.patch')
def edit(self, spec, prefix):
cflags = ['-O']
cxxflags = ['-O', self.compiler.cxx_pic_flag]