Skip to content

[cxxmodules] Also preload TMVA/TreePlayer/Graf #1396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Teemperor wants to merge 21 commits into from
Closed

[cxxmodules] Also preload TMVA/TreePlayer/Graf #1396

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6f4dfae
[cxxmodules] Refactor LoadCoreModules.
vgvassilev Nov 25, 2017
08043ab
[cxxmodules] Add flag if module has C++ module alongside it
Teemperor Nov 30, 2017
2fc72e0
[cxxmodules] Also preload TMVA/TreePlayer/Graf
Teemperor Nov 23, 2017
fddd8e9
Fixed Vc abi check warning
Teemperor Nov 30, 2017
3f508e1
Add LD_LIBRARY_PATH to module path (broken commit?)
Teemperor Nov 30, 2017
91cb046
Also preload Gpad/RooStats
Teemperor Nov 30, 2017
57c235d
Also load GenVector
Teemperor Nov 30, 2017
a0963eb
Another attempt at loading from library path
Teemperor Nov 30, 2017
a1c8a35
Also preload Hist
Teemperor Nov 30, 2017
d72805b
Also preload Net
Teemperor Nov 30, 2017
cae72d1
Fixed library loading
Teemperor Dec 1, 2017
2e3d606
Re-enable header parsing on demand
Teemperor Dec 1, 2017
67003b0
Also preload TreeViewer
Teemperor Dec 1, 2017
0788356
Also add cwd to prebuilt module path
Teemperor Dec 1, 2017
59819b1
also preload math
Teemperor Dec 1, 2017
5b04cee
Also preload TMVAGui
Teemperor Dec 1, 2017
034558d
Also preload RooFit
Teemperor Dec 1, 2017
dd365a4
Also preload RGL
Teemperor Dec 1, 2017
2331cb3
Also preload EG
Teemperor Dec 1, 2017
02e971a
Math -> MathCore
Teemperor Dec 1, 2017
c8311df
Use sparse vector in LoadedSLocEntryTable
Teemperor Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed library loading
  • Loading branch information
@Teemperor
Teemperor committed Dec 3, 2017
commit cae72d1ed091b87486f82c7652d910a564e3b202
23 changes: 19 additions & 4 deletions core/metacling/src/TCling.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,11 +1127,12 @@ static void loadModulePath(HeaderSearch& hdrSearch, const char* inputPath) {
path.split(paths, ":");

for (StringRef path : paths) {
SmallString<128> ModuleMapFilePath = path;
SmallString<128> ModuleMapFilePath = path;
llvm::sys::path::append(ModuleMapFilePath, "module.modulemap");

if (auto file = hdrSearch.getFileMgr().getFile(ModuleMapFilePath)) {
hdrSearch.loadModuleMapFile(file, false, FileID());
}
if (auto file = hdrSearch.getFileMgr().getFile(ModuleMapFilePath)) {
hdrSearch.loadModuleMapFile(file, false, FileID());
}
}
}
}
Expand Down Expand Up @@ -5119,6 +5120,20 @@ Int_t TCling::LoadLibraryMap(const char* rootmapfile)
}
if (!skip) {
void* dirp = gSystem->OpenDirectory(d);

// Load the modulemap from the dir and add it to the prebuilt module
// path.
// FIXME: This is ROOT quality code, refactor me.
fInterpreter->getCI()->getHeaderSearchOpts().AddPrebuiltModulePath(d.Data());
auto& hdrSearch = fInterpreter->getCI()->getPreprocessor().getHeaderSearchInfo();
SmallString<128> ModuleMapFilePath = StringRef(d.Data());
llvm::sys::path::append(ModuleMapFilePath, "module.modulemap");

if (auto file = hdrSearch.getFileMgr().getFile(ModuleMapFilePath)) {
hdrSearch.loadModuleMapFile(file, false, FileID());
}


if (dirp) {
if (gDebug > 3) {
Info("LoadLibraryMap", "%s", d.Data());
Expand Down