3181f90 · opencog-CompactHash

Changed files (3) +72 -62

HashFactory/HashFactory.c +48 -40

…	…	@@ -1143,7 +1143,7 @@ int intintIdentityPerfectHash_InnerInsert(char *tableData,
1143	1143	int key;
1144	1144	int index;
1145	1145	int exitCode;
1146		uint i;
	1146	uint i;;
1147	1147	for (i = 0; i < numEntries; i++) {
1148	1148	key = keys[i];
1149	1149	index =
…	…	@@ -1169,7 +1169,7 @@ int intintIdentityPerfectHash_InnerInsert(char *tableData,
1169	1169	buckets[index].value = values[i];
1170	1170	break;
1171	1171	default:
1172		return exitCode;
	1172	resultExitCode = exitCode;
1173	1173	}
1174	1174	}
1175	1175	return resultExitCode;
…	…	@@ -1218,7 +1218,7 @@ int intintIdentityPerfectHash_InnerInsertNoOverwrite(char *tableData,
1218	1218	int key;
1219	1219	int index;
1220	1220	int exitCode;
1221		uint i;
	1221	uint i;;
1222	1222	for (i = 0; i < numEntries; i++) {
1223	1223	key = keys[i];
1224	1224	index =
…	…	@@ -1245,7 +1245,7 @@ int intintIdentityPerfectHash_InnerInsertNoOverwrite(char *tableData,
1245	1245	buckets[index].value = values[i];
1246	1246	break;
1247	1247	default:
1248		return exitCode;
	1248	resultExitCode = exitCode;
1249	1249	}
1250	1250	}
1251	1251	return resultExitCode;
…	…	@@ -1914,6 +1914,7 @@ int intintIdentityPerfectOpenMPHash_InnerInsert(char *tableData,
1914	1914	int index;
1915	1915	int exitCode;
1916	1916	uint i;
	1917	#pragma omp parallel for
1917	1918	for (i = 0; i < numEntries; i++) {
1918	1919	key = keys[i];
1919	1920	index =
…	…	@@ -1939,7 +1940,7 @@ int intintIdentityPerfectOpenMPHash_InnerInsert(char *tableData,
1939	1940	buckets[index].value = values[i];
1940	1941	break;
1941	1942	default:
1942		return exitCode;
	1943	resultExitCode = exitCode;
1943	1944	}
1944	1945	}
1945	1946	return resultExitCode;
…	…	@@ -1992,6 +1993,7 @@ int intintIdentityPerfectOpenMPHash_InnerInsertNoOverwrite(char *tableData,
1992	1993	int index;
1993	1994	int exitCode;
1994	1995	uint i;
	1996	#pragma omp parallel for
1995	1997	for (i = 0; i < numEntries; i++) {
1996	1998	key = keys[i];
1997	1999	index =
…	…	@@ -2018,7 +2020,7 @@ int intintIdentityPerfectOpenMPHash_InnerInsertNoOverwrite(char *tableData,
2018	2020	buckets[index].value = values[i];
2019	2021	break;
2020	2022	default:
2021		return exitCode;
	2023	resultExitCode = exitCode;
2022	2024	}
2023	2025	}
2024	2026	return resultExitCode;
…	…	@@ -2269,7 +2271,7 @@ int intintIdentitySentinelPerfectHash_InnerInsert(char *tableData,
2269	2271	int key;
2270	2272	int index;
2271	2273	int exitCode;
2272		uint i;
	2274	uint i;;
2273	2275	for (i = 0; i < numEntries; i++) {
2274	2276	key = keys[i];
2275	2277	index =
…	…	@@ -2289,7 +2291,7 @@ int intintIdentitySentinelPerfectHash_InnerInsert(char *tableData,
2289	2291	buckets[index].value = values[i];
2290	2292	break;
2291	2293	default:
2292		return exitCode;
	2294	resultExitCode = exitCode;
2293	2295	}
2294	2296	}
2295	2297	return resultExitCode;
…	…	@@ -2335,7 +2337,7 @@ int intintIdentitySentinelPerfectHash_InnerInsertNoOverwrite(char *tableData,
2335	2337	int key;
2336	2338	int index;
2337	2339	int exitCode;
2338		uint i;
	2340	uint i;;
2339	2341	for (i = 0; i < numEntries; i++) {
2340	2342	key = keys[i];
2341	2343	index =
…	…	@@ -2356,7 +2358,7 @@ int intintIdentitySentinelPerfectHash_InnerInsertNoOverwrite(char *tableData,
2356	2358	buckets[index].value = values[i];
2357	2359	break;
2358	2360	default:
2359		return exitCode;
	2361	resultExitCode = exitCode;
2360	2362	}
2361	2363	}
2362	2364	return resultExitCode;
…	…	@@ -3075,6 +3077,7 @@ int intintIdentitySentinelPerfectOpenMPHash_InnerInsert(char *tableData,
3075	3077	int index;
3076	3078	int exitCode;
3077	3079	uint i;
	3080	#pragma omp parallel for
3078	3081	for (i = 0; i < numEntries; i++) {
3079	3082	key = keys[i];
3080	3083	index =
…	…	@@ -3094,7 +3097,7 @@ int intintIdentitySentinelPerfectOpenMPHash_InnerInsert(char *tableData,
3094	3097	buckets[index].value = values[i];
3095	3098	break;
3096	3099	default:
3097		return exitCode;
	3100	resultExitCode = exitCode;
3098	3101	}
3099	3102	}
3100	3103	return resultExitCode;
…	…	@@ -3148,6 +3151,7 @@ int intintIdentitySentinelPerfectOpenMPHash_InnerInsertNoOverwrite(char
3148	3151	int index;
3149	3152	int exitCode;
3150	3153	uint i;
	3154	#pragma omp parallel for
3151	3155	for (i = 0; i < numEntries; i++) {
3152	3156	key = keys[i];
3153	3157	index =
…	…	@@ -3168,7 +3172,7 @@ int intintIdentitySentinelPerfectOpenMPHash_InnerInsertNoOverwrite(char
3168	3172	buckets[index].value = values[i];
3169	3173	break;
3170	3174	default:
3171		return exitCode;
	3175	resultExitCode = exitCode;
3172	3176	}
3173	3177	}
3174	3178	return resultExitCode;
…	…	@@ -3478,7 +3482,7 @@ int intintLCGLinearOpenCompactHash_InnerInsert(char *tableData,
3478	3482	int key;
3479	3483	int index;
3480	3484	int exitCode;
3481		uint i;
	3485	uint i;;
3482	3486	for (i = 0; i < numEntries; i++) {
3483	3487	key = keys[i];
3484	3488	intintLCGLinearOpenCompactHash_TableData *mytableData =
…	…	@@ -3518,7 +3522,7 @@ int intintLCGLinearOpenCompactHash_InnerInsert(char *tableData,
3518	3522	buckets[index].value = values[i];
3519	3523	break;
3520	3524	default:
3521		return exitCode;
	3525	resultExitCode = exitCode;
3522	3526	}
3523	3527	}
3524	3528	return resultExitCode;
…	…	@@ -3581,7 +3585,7 @@ int intintLCGLinearOpenCompactHash_InnerInsertNoOverwrite(char *tableData,
3581	3585	int key;
3582	3586	int index;
3583	3587	int exitCode;
3584		uint i;
	3588	uint i;;
3585	3589	for (i = 0; i < numEntries; i++) {
3586	3590	key = keys[i];
3587	3591	intintLCGLinearOpenCompactHash_TableData *mytableData =
…	…	@@ -3622,7 +3626,7 @@ int intintLCGLinearOpenCompactHash_InnerInsertNoOverwrite(char *tableData,
3622	3626	buckets[index].value = values[i];
3623	3627	break;
3624	3628	default:
3625		return exitCode;
	3629	resultExitCode = exitCode;
3626	3630	}
3627	3631	}
3628	3632	return resultExitCode;
…	…	@@ -4381,6 +4385,7 @@ int intintLCGLinearOpenCompactOpenMPHash_InnerInsert(char *tableData,
4381	4385	int index;
4382	4386	int exitCode;
4383	4387	uint i;
	4388	#pragma omp parallel for
4384	4389	for (i = 0; i < numEntries; i++) {
4385	4390	key = keys[i];
4386	4391	intintLCGLinearOpenCompactOpenMPHash_TableData *mytableData =
…	…	@@ -4419,7 +4424,7 @@ int intintLCGLinearOpenCompactOpenMPHash_InnerInsert(char *tableData,
4419	4424	buckets[index].value = values[i];
4420	4425	break;
4421	4426	default:
4422		return exitCode;
	4427	resultExitCode = exitCode;
4423	4428	}
4424	4429	}
4425	4430	return resultExitCode;
…	…	@@ -4484,6 +4489,7 @@ int intintLCGLinearOpenCompactOpenMPHash_InnerInsertNoOverwrite(char *tableData,
4484	4489	int index;
4485	4490	int exitCode;
4486	4491	uint i;
	4492	#pragma omp parallel for
4487	4493	for (i = 0; i < numEntries; i++) {
4488	4494	key = keys[i];
4489	4495	intintLCGLinearOpenCompactOpenMPHash_TableData *mytableData =
…	…	@@ -4523,7 +4529,7 @@ int intintLCGLinearOpenCompactOpenMPHash_InnerInsertNoOverwrite(char *tableData,
4523	4529	buckets[index].value = values[i];
4524	4530	break;
4525	4531	default:
4526		return exitCode;
	4532	resultExitCode = exitCode;
4527	4533	}
4528	4534	}
4529	4535	return resultExitCode;
…	…	@@ -4846,7 +4852,7 @@ int intintLCGQuadraticOpenCompactHash_InnerInsert(char *tableData,
4846	4852	int key;
4847	4853	int index;
4848	4854	int exitCode;
4849		uint i;
	4855	uint i;;
4850	4856	for (i = 0; i < numEntries; i++) {
4851	4857	key = keys[i];
4852	4858	intintLCGQuadraticOpenCompactHash_TableData *mytableData =
…	…	@@ -4889,7 +4895,7 @@ int intintLCGQuadraticOpenCompactHash_InnerInsert(char *tableData,
4889	4895	buckets[index].value = values[i];
4890	4896	break;
4891	4897	default:
4892		return exitCode;
	4898	resultExitCode = exitCode;
4893	4899	}
4894	4900	}
4895	4901	return resultExitCode;
…	…	@@ -4957,7 +4963,7 @@ int intintLCGQuadraticOpenCompactHash_InnerInsertNoOverwrite(char *tableData,
4957	4963	int key;
4958	4964	int index;
4959	4965	int exitCode;
4960		uint i;
	4966	uint i;;
4961	4967	for (i = 0; i < numEntries; i++) {
4962	4968	key = keys[i];
4963	4969	intintLCGQuadraticOpenCompactHash_TableData *mytableData =
…	…	@@ -5001,7 +5007,7 @@ int intintLCGQuadraticOpenCompactHash_InnerInsertNoOverwrite(char *tableData,
5001	5007	buckets[index].value = values[i];
5002	5008	break;
5003	5009	default:
5004		return exitCode;
	5010	resultExitCode = exitCode;
5005	5011	}
5006	5012	}
5007	5013	return resultExitCode;
…	…	@@ -5799,6 +5805,7 @@ int intintLCGQuadraticOpenCompactOpenMPHash_InnerInsert(char *tableData,
5799	5805	int index;
5800	5806	int exitCode;
5801	5807	uint i;
	5808	#pragma omp parallel for
5802	5809	for (i = 0; i < numEntries; i++) {
5803	5810	key = keys[i];
5804	5811	intintLCGQuadraticOpenCompactOpenMPHash_TableData *mytableData =
…	…	@@ -5839,7 +5846,7 @@ int intintLCGQuadraticOpenCompactOpenMPHash_InnerInsert(char *tableData,
5839	5846	buckets[index].value = values[i];
5840	5847	break;
5841	5848	default:
5842		return exitCode;
	5849	resultExitCode = exitCode;
5843	5850	}
5844	5851	}
5845	5852	return resultExitCode;
…	…	@@ -5913,6 +5920,7 @@ int intintLCGQuadraticOpenCompactOpenMPHash_InnerInsertNoOverwrite(char
5913	5920	int index;
5914	5921	int exitCode;
5915	5922	uint i;
	5923	#pragma omp parallel for
5916	5924	for (i = 0; i < numEntries; i++) {
5917	5925	key = keys[i];
5918	5926	intintLCGQuadraticOpenCompactOpenMPHash_TableData *mytableData =
…	…	@@ -5954,7 +5962,7 @@ int intintLCGQuadraticOpenCompactOpenMPHash_InnerInsertNoOverwrite(char
5954	5962	buckets[index].value = values[i];
5955	5963	break;
5956	5964	default:
5957		return exitCode;
	5965	resultExitCode = exitCode;
5958	5966	}
5959	5967	}
5960	5968	return resultExitCode;
…	…	@@ -6440,7 +6448,7 @@ const char *HashFactory_source =
6440	6448	" int key;\n"
6441	6449	" int index;\n"
6442	6450	" int exitCode;\n"
6443		" uint i;\n"
	6451	" uint i;;\n"
6444	6452	" for (i = 0; i < numEntries; i++) {\n"
6445	6453	" key = keys[i];\n"
6446	6454	" index =\n"
…	…	@@ -6469,7 +6477,7 @@ const char *HashFactory_source =
6469	6477	" buckets[index].value = values[i];\n"
6470	6478	" break;\n"
6471	6479	" default:\n"
6472		" return exitCode;\n"
	6480	" resultExitCode = exitCode;\n"
6473	6481	" }\n"
6474	6482	" }\n"
6475	6483	" return resultExitCode;\n"
…	…	@@ -6522,7 +6530,7 @@ const char *HashFactory_source =
6522	6530	" int key;\n"
6523	6531	" int index;\n"
6524	6532	" int exitCode;\n"
6525		" uint i;\n"
	6533	" uint i;;\n"
6526	6534	" for (i = 0; i < numEntries; i++) {\n"
6527	6535	" key = keys[i];\n"
6528	6536	" index =\n"
…	…	@@ -6552,7 +6560,7 @@ const char *HashFactory_source =
6552	6560	" buckets[index].value = values[i];\n"
6553	6561	" break;\n"
6554	6562	" default:\n"
6555		" return exitCode;\n"
	6563	" resultExitCode = exitCode;\n"
6556	6564	" }\n"
6557	6565	" }\n"
6558	6566	" return resultExitCode;\n"
…	…	@@ -6818,7 +6826,7 @@ const char *HashFactory_source =
6818	6826	" int key;\n"
6819	6827	" int index;\n"
6820	6828	" int exitCode;\n"
6821		" uint i;\n"
	6829	" uint i;;\n"
6822	6830	" for (i = 0; i < numEntries; i++) {\n"
6823	6831	" key = keys[i];\n"
6824	6832	" index =\n"
…	…	@@ -6841,7 +6849,7 @@ const char *HashFactory_source =
6841	6849	" buckets[index].value = values[i];\n"
6842	6850	" break;\n"
6843	6851	" default:\n"
6844		" return exitCode;\n"
	6852	" resultExitCode = exitCode;\n"
6845	6853	" }\n"
6846	6854	" }\n"
6847	6855	" return resultExitCode;\n"
…	…	@@ -6894,7 +6902,7 @@ const char *HashFactory_source =
6894	6902	" int key;\n"
6895	6903	" int index;\n"
6896	6904	" int exitCode;\n"
6897		" uint i;\n"
	6905	" uint i;;\n"
6898	6906	" for (i = 0; i < numEntries; i++) {\n"
6899	6907	" key = keys[i];\n"
6900	6908	" index =\n"
…	…	@@ -6918,7 +6926,7 @@ const char *HashFactory_source =
6918	6926	" buckets[index].value = values[i];\n"
6919	6927	" break;\n"
6920	6928	" default:\n"
6921		" return exitCode;\n"
	6929	" resultExitCode = exitCode;\n"
6922	6930	" }\n"
6923	6931	" }\n"
6924	6932	" return resultExitCode;\n"
…	…	@@ -7246,7 +7254,7 @@ const char *HashFactory_source =
7246	7254	" int key;\n"
7247	7255	" int index;\n"
7248	7256	" int exitCode;\n"
7249		" uint i;\n"
	7257	" uint i;;\n"
7250	7258	" for (i = 0; i < numEntries; i++) {\n"
7251	7259	" key = keys[i];\n"
7252	7260	" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData\n"
…	…	@@ -7286,7 +7294,7 @@ const char *HashFactory_source =
7286	7294	" buckets[index].value = values[i];\n"
7287	7295	" break;\n"
7288	7296	" default:\n"
7289		" return exitCode;\n"
	7297	" resultExitCode = exitCode;\n"
7290	7298	" }\n"
7291	7299	" }\n"
7292	7300	" return resultExitCode;\n"
…	…	@@ -7351,7 +7359,7 @@ const char *HashFactory_source =
7351	7359	" int key;\n"
7352	7360	" int index;\n"
7353	7361	" int exitCode;\n"
7354		" uint i;\n"
	7362	" uint i;;\n"
7355	7363	" for (i = 0; i < numEntries; i++) {\n"
7356	7364	" key = keys[i];\n"
7357	7365	" __global intintLCGLinearOpenCompactCLHash_TableData *mytableData\n"
…	…	@@ -7392,7 +7400,7 @@ const char *HashFactory_source =
7392	7400	" buckets[index].value = values[i];\n"
7393	7401	" break;\n"
7394	7402	" default:\n"
7395		" return exitCode;\n"
	7403	" resultExitCode = exitCode;\n"
7396	7404	" }\n"
7397	7405	" }\n"
7398	7406	" return resultExitCode;\n"
…	…	@@ -7731,7 +7739,7 @@ const char *HashFactory_source =
7731	7739	" int key;\n"
7732	7740	" int index;\n"
7733	7741	" int exitCode;\n"
7734		" uint i;\n"
	7742	" uint i;;\n"
7735	7743	" for (i = 0; i < numEntries; i++) {\n"
7736	7744	" key = keys[i];\n"
7737	7745	" __global intintLCGQuadraticOpenCompactCLHash_TableData\n"
…	…	@@ -7775,7 +7783,7 @@ const char *HashFactory_source =
7775	7783	" buckets[index].value = values[i];\n"
7776	7784	" break;\n"
7777	7785	" default:\n"
7778		" return exitCode;\n"
	7786	" resultExitCode = exitCode;\n"
7779	7787	" }\n"
7780	7788	" }\n"
7781	7789	" return resultExitCode;\n"
…	…	@@ -7848,7 +7856,7 @@ const char *HashFactory_source =
7848	7856	" int key;\n"
7849	7857	" int index;\n"
7850	7858	" int exitCode;\n"
7851		" uint i;\n"
	7859	" uint i;;\n"
7852	7860	" for (i = 0; i < numEntries; i++) {\n"
7853	7861	" key = keys[i];\n"
7854	7862	" __global intintLCGQuadraticOpenCompactCLHash_TableData\n"
…	…	@@ -7893,7 +7901,7 @@ const char *HashFactory_source =
7893	7901	" buckets[index].value = values[i];\n"
7894	7902	" break;\n"
7895	7903	" default:\n"
7896		" return exitCode;\n"
	7904	" resultExitCode = exitCode;\n"
7897	7905	" }\n"
7898	7906	" }\n"
7899	7907	" return resultExitCode;\n"

HashFactory/HashFactory.cl +16 -16

…	…	@@ -427,7 +427,7 @@ int intintIdentityPerfectCLHash_InnerInsert(__global char *tableData,
427	427	int key;
428	428	int index;
429	429	int exitCode;
430		uint i;
	430	uint i;;
431	431	for (i = 0; i < numEntries; i++) {
432	432	key = keys[i];
433	433	index =
…	…	@@ -456,7 +456,7 @@ int intintIdentityPerfectCLHash_InnerInsert(__global char *tableData,
456	456	buckets[index].value = values[i];
457	457	break;
458	458	default:
459		return exitCode;
	459	resultExitCode = exitCode;
460	460	}
461	461	}
462	462	return resultExitCode;
…	…	@@ -509,7 +509,7 @@ int intintIdentityPerfectCLHash_InnerInsertNoOverwrite(__global char *tableData,
509	509	int key;
510	510	int index;
511	511	int exitCode;
512		uint i;
	512	uint i;;
513	513	for (i = 0; i < numEntries; i++) {
514	514	key = keys[i];
515	515	index =
…	…	@@ -539,7 +539,7 @@ int intintIdentityPerfectCLHash_InnerInsertNoOverwrite(__global char *tableData,
539	539	buckets[index].value = values[i];
540	540	break;
541	541	default:
542		return exitCode;
	542	resultExitCode = exitCode;
543	543	}
544	544	}
545	545	return resultExitCode;
…	…	@@ -805,7 +805,7 @@ int intintIdentitySentinelPerfectCLHash_InnerInsert(__global char *tableData,
805	805	int key;
806	806	int index;
807	807	int exitCode;
808		uint i;
	808	uint i;;
809	809	for (i = 0; i < numEntries; i++) {
810	810	key = keys[i];
811	811	index =
…	…	@@ -828,7 +828,7 @@ int intintIdentitySentinelPerfectCLHash_InnerInsert(__global char *tableData,
828	828	buckets[index].value = values[i];
829	829	break;
830	830	default:
831		return exitCode;
	831	resultExitCode = exitCode;
832	832	}
833	833	}
834	834	return resultExitCode;
…	…	@@ -881,7 +881,7 @@ int intintIdentitySentinelPerfectCLHash_InnerInsertNoOverwrite(__global char
881	881	int key;
882	882	int index;
883	883	int exitCode;
884		uint i;
	884	uint i;;
885	885	for (i = 0; i < numEntries; i++) {
886	886	key = keys[i];
887	887	index =
…	…	@@ -905,7 +905,7 @@ int intintIdentitySentinelPerfectCLHash_InnerInsertNoOverwrite(__global char
905	905	buckets[index].value = values[i];
906	906	break;
907	907	default:
908		return exitCode;
	908	resultExitCode = exitCode;
909	909	}
910	910	}
911	911	return resultExitCode;
…	…	@@ -1233,7 +1233,7 @@ int intintLCGLinearOpenCompactCLHash_InnerInsert(__global char *tableData,
1233	1233	int key;
1234	1234	int index;
1235	1235	int exitCode;
1236		uint i;
	1236	uint i;;
1237	1237	for (i = 0; i < numEntries; i++) {
1238	1238	key = keys[i];
1239	1239	__global intintLCGLinearOpenCompactCLHash_TableData *mytableData
…	…	@@ -1273,7 +1273,7 @@ int intintLCGLinearOpenCompactCLHash_InnerInsert(__global char *tableData,
1273	1273	buckets[index].value = values[i];
1274	1274	break;
1275	1275	default:
1276		return exitCode;
	1276	resultExitCode = exitCode;
1277	1277	}
1278	1278	}
1279	1279	return resultExitCode;
…	…	@@ -1338,7 +1338,7 @@ int intintLCGLinearOpenCompactCLHash_InnerInsertNoOverwrite(__global char
1338	1338	int key;
1339	1339	int index;
1340	1340	int exitCode;
1341		uint i;
	1341	uint i;;
1342	1342	for (i = 0; i < numEntries; i++) {
1343	1343	key = keys[i];
1344	1344	__global intintLCGLinearOpenCompactCLHash_TableData *mytableData
…	…	@@ -1379,7 +1379,7 @@ int intintLCGLinearOpenCompactCLHash_InnerInsertNoOverwrite(__global char
1379	1379	buckets[index].value = values[i];
1380	1380	break;
1381	1381	default:
1382		return exitCode;
	1382	resultExitCode = exitCode;
1383	1383	}
1384	1384	}
1385	1385	return resultExitCode;
…	…	@@ -1718,7 +1718,7 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsert(__global char *tableData,
1718	1718	int key;
1719	1719	int index;
1720	1720	int exitCode;
1721		uint i;
	1721	uint i;;
1722	1722	for (i = 0; i < numEntries; i++) {
1723	1723	key = keys[i];
1724	1724	__global intintLCGQuadraticOpenCompactCLHash_TableData
…	…	@@ -1762,7 +1762,7 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsert(__global char *tableData,
1762	1762	buckets[index].value = values[i];
1763	1763	break;
1764	1764	default:
1765		return exitCode;
	1765	resultExitCode = exitCode;
1766	1766	}
1767	1767	}
1768	1768	return resultExitCode;
…	…	@@ -1835,7 +1835,7 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsertNoOverwrite(__global char
1835	1835	int key;
1836	1836	int index;
1837	1837	int exitCode;
1838		uint i;
	1838	uint i;;
1839	1839	for (i = 0; i < numEntries; i++) {
1840	1840	key = keys[i];
1841	1841	__global intintLCGQuadraticOpenCompactCLHash_TableData
…	…	@@ -1880,7 +1880,7 @@ int intintLCGQuadraticOpenCompactCLHash_InnerInsertNoOverwrite(__global char
1880	1880	buckets[index].value = values[i];
1881	1881	break;
1882	1882	default:
1883		return exitCode;
	1883	resultExitCode = exitCode;
1884	1884	}
1885	1885	}
1886	1886	return resultExitCode;

HashFactory/baseHash.cm +8 -6

…	…	@@ -136,7 +136,7 @@
136	136
137	137	#define CMPXCHG_HASH_READ_KEY_EXP ((buckets[index].key == HASH_BUCKET_STATUS_EMPTY) ? (buckets[index].key = key, HASH_BUCKET_STATUS_EMPTY) : buckets[index].key)\
138	138
139		#define BASE_HASH_METHODS(NAME, MODIFIER, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, READ_KEY_EXP, CL_GLOBAL, ...) \
	139	#define BASE_HASH_METHODS(NAME, MODIFIER, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, READ_KEY_EXP, PRAGMA_PARALLEL_FOR, CL_GLOBAL, ...) \
140	140	\
141	141	int NAME##MODIFIER##Hash_InnerQuerySingle(CL_GLOBAL char tableData, KEY_TYPE key, CL_GLOBAL VALUE_TYPE valueOutput){\
142	142	CL_GLOBAL NAME##MODIFIER##Hash_Bucket buckets = (CL_GLOBAL NAME##MODIFIER##Hash_Bucket)&tableData[sizeof(NAME##MODIFIER##Hash_TableData)];\
…	…	@@ -207,6 +207,7 @@
207	207	int index;\
208	208	int exitCode;\
209	209	uint i;\
	210	PRAGMA_PARALLEL_FOR;\
210	211	for(i = 0; i < numEntries; i++){\
211	212	key = keys[i];\
212	213	SEARCH_EXP(NAME, MODIFIER, COMPRESS_FUNC, COMPRESS_FUNC_DATA, READ_KEY_EXP, CL_GLOBAL, ##__VA_ARGS__)\
…	…	@@ -218,7 +219,7 @@
218	219	buckets[index].value = values[i];\
219	220	break;\
220	221	default:\
221		return exitCode;\
	222	resultExitCode = exitCode;\
222	223	}\
223	224	}\
224	225	return resultExitCode;\
…	…	@@ -248,6 +249,7 @@
248	249	int index;\
249	250	int exitCode;\
250	251	uint i;\
	252	PRAGMA_PARALLEL_FOR;\
251	253	for(i = 0; i < numEntries; i++){\
252	254	key = keys[i];\
253	255	SEARCH_EXP(NAME, MODIFIER, COMPRESS_FUNC, COMPRESS_FUNC_DATA, READ_KEY_EXP, CL_GLOBAL, ##__VA_ARGS__)\
…	…	@@ -260,7 +262,7 @@
260	262	buckets[index].value = values[i];\
261	263	break;\
262	264	default:\
263		return exitCode;\
	265	resultExitCode = exitCode;\
264	266	}\
265	267	}\
266	268	return resultExitCode;\
…	…	@@ -317,7 +319,7 @@
317	319	BASE_HASH_UTIL(NAME, MODIFIER, HASH_ID, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, FACTORY_CREATE_EXP, , CREATE_EXP, INIT_EXP, , ,\
318	320	HASH_SETUP_EXP(NAME, MODIFIER, INNER_EMPTY_EXP), HASH_EMPTY_EXP(NAME, MODIFIER, INNER_EMPTY_EXP))\
319	321	\
320		BASE_HASH_METHODS(NAME, MODIFIER, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, CMPXCHG_HASH_READ_KEY_EXP, ,##__VA_ARGS__)\
	322	BASE_HASH_METHODS(NAME, MODIFIER, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, CMPXCHG_HASH_READ_KEY_EXP, , ,##__VA_ARGS__)\
321	323	\
322	324	int NAME##MODIFIER##Hash_QuerySingle(NAME##Hash_Table table, KEY_TYPE key, VALUE_TYPE valueOutput){\
323	325	return NAME##MODIFIER##Hash_InnerQuerySingle(table->tableData, key, valueOutput);\
…	…	@@ -464,7 +466,7 @@
464	466	\
465	467	BASE_TYPES_DEFINE(NAME, MODIFIER##CL, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC_DATA)\
466	468	\
467		BASE_HASH_METHODS(NAME, MODIFIER##CL, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, READ_KEY_EXP, __global, ##__VA_ARGS__) \
	469	BASE_HASH_METHODS(NAME, MODIFIER##CL, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, READ_KEY_EXP, , __global, ##__VA_ARGS__) \
468	470	\
469	471	int NAME##MODIFIER##CLHash_QuerySingle(__global char tableData, KEY_TYPE key, __global VALUE_TYPE valueOutput){\
470	472	return NAME##MODIFIER##CLHash_InnerQuerySingle(tableData, key, valueOutput);\
…	…	@@ -654,7 +656,7 @@
654	656	BASE_HASH_UTIL(NAME, MODIFIER, HASH_ID, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, FACTORY_CREATE_EXP, , CREATE_EXP, INIT_EXP, , ,\
655	657	OPENMP_HASH_SETUP_EXP(NAME, MODIFIER, INNER_EMPTY_EXP), OPENMP_HASH_EMPTY_EXP(NAME, MODIFIER, INNER_EMPTY_EXP))\
656	658	\
657		BASE_HASH_METHODS(NAME, MODIFIER, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, CMPXCHG_HASH_READ_KEY_EXP, ,##__VA_ARGS__)\
	659	BASE_HASH_METHODS(NAME, MODIFIER, KEY_TYPE, VALUE_TYPE, COMPRESS_FUNC, COMPRESS_FUNC_DATA, SEARCH_EXP, CMPXCHG_HASH_READ_KEY_EXP, OMP_PRAGMA_PARALLEL_FOR, ,##__VA_ARGS__)\
658	660	\
659	661	int NAME##MODIFIER##Hash_QuerySingle(NAME##Hash_Table table, KEY_TYPE key, VALUE_TYPE valueOutput){\
660	662	return NAME##MODIFIER##Hash_InnerQuerySingle(table->tableData, key, valueOutput);\

opencog-CompactHash commits / 3181f90

Changed files (3) +72 -62