Moving device functions to cuh files and deprecating hpp #524
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ft_header_cuh_extensions
This reverts commit 3c4c1a9.
|
In preparation for when we do end up removing the deprecated import sys
import glob
import re
import shutil
if __name__ == "__main__":
script, raft_include_path, source_path = sys.argv
p = re.compile(r'.*\#include \<(.*)\.(.*)\>')
header_map = {}
files_globbed = []
types = ("/**/*.cuh", "/**/*.hpp", "/**/*.h")
for files in types:
files_globbed.extend([f for f in glob.glob(raft_include_path + files, recursive=True)])
for f in files_globbed:
fname, fext = f.split(".")
header_map[fname.replace(raft_include_path, "")] = fext
types_to_correct = ("/**/*.cuh", "/**/*.hpp", "/**/*.h", "/**/*.cu", "/**/*.cpp", "/**/*.c")
files_to_correct = []
for files in types_to_correct:
files_to_correct.extend([f for f in glob.glob(source_path + files, recursive=True)])
for f in files_to_correct:
with open(f, 'r') as fp:
with open("__tmp", "w") as tfp:
lines = fp.readlines()
for line in lines:
match_br = p.match(line)
if match_br is None:
tfp.write(line)
else:
fname = match_br.group(1)
fext = match_br.group(2)
if fname in header_map and header_map[fname] != fext:
replacement = "#include <%s.%s>" % (fname, header_map[fname])
new_line = p.sub(replacement, line)
tfp.write(new_line)
print("fname=%s, fext=%s, header_map=%s, new=%s" % (fname, fext, header_map[fname], new_line))
else:
tfp.write(line)
shutil.move("__tmp", f)Invoke the script w/ 2 arguments: |
cjnolet
changed the title
…ft_header_cuh_extensions
|
rerun tests |
msadang
approved these changes
Feb 25, 2022
dantegd
approved these changes
Feb 25, 2022
|
@gpucibot merge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For consistency, we had originally scraped through the primitive functions and used the
hppextension across the public API. However, it was brought to my attention more recently that this is confusing when considering the larger scope of the project- which also contains many host-only APIs that don't require a cuda-enabled compiler.However, as we're gaining more consumers, we need to start being more careful about making breaking changes to the public APIs and their header files. For this reason, I'm opting to copy the existing
hppfiles intocuhfiles, deprecating the hpp files, and using#definew/ conditionals to make sure the contents from only one file get defined even if both are included (for example, when a user includesfilea.hppbut raft internally includesfilea.cuh. This should allow us to set a version where we can make an announcement to remove the offendinghppfiles and give ample notice before the breaking change is made.