#469 Removed the creation of parsable_x90 files. Fixes #458. #538
+34
−119
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This only addresses the removal of the
parsable_x90files (and therefore fixes #458, and part of #469).The removal itself was quick, but it caused a bug in the filenames used for the
.anfiles.Originally, the PSyclone step would create a
.anfile based on the parsedparsable_x90file, e.g.sci_null_preconditioner_alg_mod.2456263381.an, storingAnalysedX90data.After processing with PSyclone, a new analyse step will analyse the algorithm layer file and create a new
.anfile. In the example above, it createdsci_null_preconditioner_alg_mod.3489817750.anThe hash value used is based on the .x90 file, and the difference is caused by the changes caused by removing the comments and invoke names while making the files parsable (so I would actually suspect if we had a x90 files without invoke names and without comments, we would hit the same bug).
When the step to make the files parsable was skipped, the hash code used for the two
.anfiles was the same (i.e. the X90 analyse file of the x90 file, and the psy-layer file using the x90 has was identical), so the x90.anfile was considered to be a prebuild, and Fab tried to load this 'prebuild asAnalysedFortran(which then of course failed).In order to avoid this, I have changed the way the file name for the
.anfiles are created: I leave the suffix (.f90 or .x90) attached to the names, so we now get two files :This makes is a lot easier to see where the files came from (in the original scheme there was only a difference in the hash, and you could not easily 'see' which one was which).
As a result, I had to modify some additional tests to accommodate this change in file names.