Skip to content

Commit e969709

Browse files
committed
Merge branch 'myhash10' into myhash2
2 parents c99130a + 64d0b94 commit e969709

File tree

4 files changed

+6
-151
lines changed

4 files changed

+6
-151
lines changed

ci/fpm-deployment.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ include=(
2929
prune=(
3030
"$destdir/test/test_always_fail.f90"
3131
"$destdir/test/test_always_skip.f90"
32+
"$destdir/test/test_hash_functions.f90"
3233
"$destdir/src/common.f90"
3334
"$destdir/src/f18estop.f90"
3435
)

src/tests/hash_functions/README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
The validation directory contains code to validate the Fortran hash functions against the original C/C++ codes. It consists of three executable applications:
1+
The validation directory contains code to validate the Fortran hash functions against the original C/C++ codes. It consists of one executable `test_hash_functions` that:
22

3-
* `generate_key_array.f90` - creates a file containing 2048 random 8 bit integers.
3+
* creates a file containing 2048 random 8 bit integers using the subroutine
4+
`generate_key_array`.
45

5-
* `generate_hash_arrays.cpp` - reads the file generated by `generate_key_array.f90` and uses its contents to generate 2049 hashes for each hash algorithm and outputs files containing the hashes.
6+
* reads the file generated by the subroutine `generate_key_array` and uses its contents to generate 2049 hashes for each C/C++ hash algorithm and outputs files containing the hashes.
67

7-
* `hash_validity_test.f90`- reads the file generated by `generate_key_array.f90` and uses its contents to generate 2049 hashes for each hash algorithm and compares the result with the corresponding outputs of `generate_hash_arrays.cpp` reporting if the outputs are not equal.
8-
9-
Note the C code for nmhash assumes that the C compiler is either gcc or MSVC, and will not compile with the Intel C compiler.
8+
* reads the file generated by the subroutine `generate_key_array` and uses its contents to generate 2049 hashes for each Fortran hash algorithm and compares the result with the corresponding outputs of C/C++ hash algorithms.

src/tests/hash_functions/generate_key_array.f90

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/tests/hash_functions/hash_validity_test.f90

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)