[V6.1 RC] Fixes #101 and new NVCC required option #123
Conversation
| @@ -19,7 +22,8 @@ int MainContainer::Init () { | |||
| c.append_attribute("cross").set_value("GPU"); | |||
| #endif | |||
| solver->configfile.save_file(filename); | |||
There was a problem hiding this comment.
You cannot write the xml file after the execution, because the execution can fail, or can be stopped - and you would still want the xml file to be created.
There was a problem hiding this comment.
BUT we don't want to process altered XML.
I might add save of deep copy instead of solver->configfile directly
There was a problem hiding this comment.
I see no problem in processing the altered XML. Maybe even in future we will want to add things to the XML on-the-go (by python for instance)
| @@ -204,16 +204,17 @@ vHandler * getHandler(pugi::xml_node node) { | |||
| ret = new acSyntheticTurbulence; | |||
| } else if (name=="Run") { | |||
| output("Skipping 'Run' element"); | |||
| }else { | |||
| ret = new Callback(); | |||
There was a problem hiding this comment.
Why generic Callback? I think it should be NULL. If there is segfault because of it - this should be solved, where the segfault occurs.
There was a problem hiding this comment.
because: https://github.com/CFD-GO/TCLB/blob/v6.1_candidate/src/Handlers.h#L17
It does fault with NULL pointer. I think that returning NULL where pointer-to-object is expected is design error.
I could change it to
if (hand != NULL) {
hand->solver = solver_;
int ret = hand->Init();
if (ret) {
delete hand;
hand = NULL;
}
}
ref = new int;
*ref=1;
debug0("Handler shared pointer: create\n");but other methods of Handler might expect it to be valid object somewhere
There was a problem hiding this comment.
Maybe NullCallback or something? To have consistent return data type
There was a problem hiding this comment.
Ok, please add a NullHandler then.
llaniewski
changed the title
|
Closes #101 |
xmlint not is ok with config, and:
fixes compilation issues on newer GCC/NVCC
after
BVLC/caffe#4046