2056d3c · opencog-CompactHash · pear-git-v3

Overview Files Commits Issues Docs Releases Peers

opencog-CompactHash commits / 2056d3c

Fixing dependency of HashFactory.c to depend on HashFactory.h Fixing formatting in HashFactory.h

2056d3c25abc0736bcab2f33f3283255279b14c1

by brobey <brobey@lanl.gov> · 2015-11-05T20:25:15.000Z

Changed files (4) +6 -6

HashFactory/HashFactory.h +2 -2

…	…	@@ -142,7 +142,7 @@ int clFinish(int command_queue);
142	142	#define HASH_SEARCH_CODE_MISMATCH /**/ 1
143	143	#define HASH_SEARCH_CODE_EMPTY /*****/ 2
144	144	//
145		#define HASH_NUM_HASHES /********/ 12
	145	#define HASH_NUM_HASHES /*********/ 12
146	146	#define HASH_NUM_C_HASHES /*******/ 4
147	147	#define HASH_NUM_CL_HASHES /******/ 4
148	148	#define HASH_NUM_OPENMP_HASHES /**/ 4
…	…	@@ -157,7 +157,7 @@ int clFinish(int command_queue);
157	157	#define LCG_LINEAR_OPEN_COMPACT_CL_HASH_ID /*********/ 64
158	158	#define LCG_QUADRATIC_OPEN_COMPACT_CL_HASH_ID /******/ 128
159	159	//
160		#define IDENTITY_PERFECT_OPENMP_HASH_ID /***********/ 256
	160	#define IDENTITY_PERFECT_OPENMP_HASH_ID /************/ 256
161	161	#define IDENTITY_SENTINEL_PERFECT_OPENMP_HASH_ID /***/ 512
162	162	#define LCG_LINEAR_OPEN_COMPACT_OPENMP_HASH_ID /*****/ 1024
163	163	#define LCG_QUADRATIC_OPEN_COMPACT_OPENMP_HASH_ID /**/ 2048

HashFactory/HashFactory.hp +2 -2

…	…	@@ -118,7 +118,7 @@ DELAY(#define HASH_SEARCH_CODE_MATCH /*****/ 0)
118	118	DELAY(#define HASH_SEARCH_CODE_MISMATCH /**/ 1)
119	119	DELAY(#define HASH_SEARCH_CODE_EMPTY /*****/ 2)
120	120	//
121		DELAY(#define HASH_NUM_HASHES /********/ 12)
	121	DELAY(#define HASH_NUM_HASHES /*********/ 12)
122	122	DELAY(#define HASH_NUM_C_HASHES /*******/ 4)
123	123	DELAY(#define HASH_NUM_CL_HASHES /******/ 4)
124	124	DELAY(#define HASH_NUM_OPENMP_HASHES /**/ 4)
…	…	@@ -133,7 +133,7 @@ DELAY(#define IDENTITY_SENTINEL_PERFECT_CL_HASH_ID /*******/ 32)
133	133	DELAY(#define LCG_LINEAR_OPEN_COMPACT_CL_HASH_ID /*********/ 64)
134	134	DELAY(#define LCG_QUADRATIC_OPEN_COMPACT_CL_HASH_ID /******/ 128)
135	135	//
136		DELAY(#define IDENTITY_PERFECT_OPENMP_HASH_ID /***********/ 256)
	136	DELAY(#define IDENTITY_PERFECT_OPENMP_HASH_ID /************/ 256)
137	137	DELAY(#define IDENTITY_SENTINEL_PERFECT_OPENMP_HASH_ID /***/ 512)
138	138	DELAY(#define LCG_LINEAR_OPEN_COMPACT_OPENMP_HASH_ID /*****/ 1024)
139	139	DELAY(#define LCG_QUADRATIC_OPEN_COMPACT_OPENMP_HASH_ID /**/ 2048)

HashFactory/Makefile.am +1 -1

…	…	@@ -23,7 +23,7 @@ hashTest_LDADD = libHashFactory.la
23	23	HashFactory.h: HashFactory.hp HashFactory.hm perfectHash.hm compactHash.hm
24	24	${CPREPROCESSOR} -CC -x c -imacros HashFactory.hm HashFactory.hp \| ${INDENT} -linux -brf -o HashFactory.h
25	25
26		HashFactory.c: HashFactory.cp HashFactory.cm HashFactory.cl perfectHash.cm compactHash.cm
	26	HashFactory.c: HashFactory.cp HashFactory.cm HashFactory.cl perfectHash.cm compactHash.cm HashFactory.h
27	27	${CPREPROCESSOR} -CC -x c -imacros HashFactory.cm HashFactory.cp \| ${INDENT} -linux -brf -o HashFactory.c
28	28	./embed_source.pl HashFactory.cl >> HashFactory.c
29	29

HashFactory/Makefile.in +1 -1

…	…	@@ -769,7 +769,7 @@ test: hashTest
769	769	HashFactory.h: HashFactory.hp HashFactory.hm perfectHash.hm compactHash.hm
770	770	${CPREPROCESSOR} -CC -x c -imacros HashFactory.hm HashFactory.hp \| ${INDENT} -linux -brf -o HashFactory.h
771	771
772		HashFactory.c: HashFactory.cp HashFactory.cm HashFactory.cl perfectHash.cm compactHash.cm
	772	HashFactory.c: HashFactory.cp HashFactory.cm HashFactory.cl perfectHash.cm compactHash.cm HashFactory.h
773	773	${CPREPROCESSOR} -CC -x c -imacros HashFactory.cm HashFactory.cp \| ${INDENT} -linux -brf -o HashFactory.c
774	774	./embed_source.pl HashFactory.cl >> HashFactory.c
775	775