-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'sqrt_bunchsize', addition of dropout and square length …
…penalty to master branch
- Loading branch information
Showing
30 changed files
with
680 additions
and
1,072 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| formiga.build_dir = "build_experimental_debug" | ||
|
|
||
| luapkg{ | ||
| program_name = "april-ann.experimental.debug", | ||
| verbosity_level = 0, -- 0 => NONE, 1 => ONLY TARGETS, 2 => ALL | ||
| packages = dofile "package_list.lua", | ||
| global_flags = { | ||
| debug="yes", | ||
| use_lstrip = "no", | ||
| use_readline="yes", | ||
| optimization = "no", | ||
| platform = "unix", | ||
| extra_flags={ | ||
| "-pg", | ||
| }, | ||
| extra_libs={ | ||
| "-pg", | ||
| "-lpthread", | ||
| "-lblas", | ||
| "-latlas", | ||
| "-L/opt/lib", | ||
| "-lgfortran", | ||
| }, | ||
|
|
||
| }, | ||
|
|
||
| main_package = package{ | ||
| name = "main_package", | ||
| default_target = "build", | ||
| target{ | ||
| name = "init", | ||
| mkdir{ dir = "bin" }, | ||
| mkdir{ dir = "build" }, | ||
| mkdir{ dir = "include" }, | ||
| }, | ||
| target{ | ||
| name = "provide", | ||
| depends = "init", | ||
| copy{ file = formiga.os.compose_dir(formiga.os.cwd,"lua","include","*.h"), dest_dir = "include" } | ||
| }, | ||
| target{ name = "clean_all", | ||
| exec{ command = [[find . -name "*~" -exec rm {} ';']] }, | ||
| delete{ dir = "bin" }, | ||
| delete{ dir = "build" }, | ||
| delete{ dir = "build_doc" }, | ||
| delete{ dir = "doxygen_doc" }, | ||
| }, | ||
| target{ name = "clean", | ||
| delete{ dir = "bin" }, | ||
| delete{ dir = "build" }, | ||
| delete{ dir = "build_doc" }, | ||
| }, | ||
| target{ name = "document_clean", | ||
| delete{ dir = "build_doc" }, | ||
| delete{ dir = "doxygen_doc" }, | ||
| }, | ||
| target{ | ||
| name = "build", | ||
| depends = "provide", | ||
| object{ | ||
| file = formiga.os.compose_dir("binding","c_src","*.cc"), | ||
| include_dirs = "include", | ||
| dest_dir = formiga.global_properties.build_dir, | ||
| }, | ||
| link_main_program{}, | ||
| create_static_library{}, | ||
| copy_header_files{}, | ||
| dot_graph{ | ||
| file_name = "dep_graph.dot" | ||
| }, | ||
| use_timestamp = true, | ||
| }, | ||
| target{ name = "document", | ||
| echo{"this is documentation"}, | ||
| main_documentation{ | ||
| dev_documentation = { | ||
| main_documentation_file = formiga.os.compose_dir("docs","april_dev.dox"), | ||
| doxygen_options = { | ||
| GENERATE_LATEX = 'NO', | ||
| }, | ||
| }, | ||
| user_documentation = { | ||
| main_documentation_file = formiga.os.compose_dir("docs","april_user_ref.dox"), | ||
| doxygen_options = { | ||
| GENERATE_LATEX = 'NO', | ||
| }, | ||
| } | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| if arg[2] == nil then | ||
| arg[2] = "." | ||
| end | ||
|
|
||
| formiga.os.execute("mkdir -p "..formiga.os.compose_dir(arg[2], "bin")) | ||
| formiga.os.execute("mkdir -p "..formiga.os.compose_dir(arg[2], "lib")) | ||
| formiga.os.execute("mkdir -p "..formiga.os.compose_dir(arg[2], "include")) | ||
| formiga.os.execute("cp "..formiga.os.compose_dir(formiga.build_dir,"bin",formiga.program_name) | ||
| .." "..formiga.os.compose_dir(arg[2], "bin", formiga.program_name)) | ||
| formiga.os.execute("cp -R "..formiga.os.compose_dir(formiga.build_dir,"lib") | ||
| .." "..arg[2]) | ||
| formiga.os.execute("cp -R "..formiga.os.compose_dir(formiga.build_dir,"include","april") | ||
| .." "..formiga.os.compose_dir(arg[2], "include")) | ||
|
|
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| formiga.build_dir = "build_experimental_release" | ||
|
|
||
| luapkg{ | ||
| program_name = "april-ann.experimental", | ||
| verbosity_level = 0, -- 0 => NONE, 1 => ONLY TARGETS, 2 => ALL | ||
| packages = dofile "package_list.lua", | ||
| global_flags = { | ||
| debug="no", | ||
| use_lstrip = "no", | ||
| use_readline="yes", | ||
| optimization = "yes", | ||
| platform = "unix", | ||
| extra_flags={ | ||
| -- For Intel MKL :) | ||
| "-DUSE_MKL", | ||
| "-I/opt/MKL/include", | ||
| -------------------- | ||
| "-march=native", | ||
| "-msse", | ||
| "-DNDEBUG", | ||
| }, | ||
| extra_libs={ | ||
| "-lpthread", | ||
| -- For Intel MKL :) | ||
| "-L/opt/MKL/lib", | ||
| "-lmkl_intel_lp64", | ||
| "-Wl,--start-group", | ||
| "-lmkl_intel_thread", | ||
| "-lmkl_core", | ||
| "-Wl,--end-group", | ||
| "-liomp5" | ||
| }, | ||
| }, | ||
|
|
||
| main_package = package{ | ||
| name = "main_package", | ||
| default_target = "build", | ||
| target{ | ||
| name = "init", | ||
| mkdir{ dir = "bin" }, | ||
| mkdir{ dir = "build" }, | ||
| mkdir{ dir = "include" }, | ||
| }, | ||
| target{ | ||
| name = "provide", | ||
| depends = "init", | ||
| copy{ file = formiga.os.compose_dir(formiga.os.cwd,"lua","include","*.h"), dest_dir = "include" } | ||
| }, | ||
| target{ name = "clean_all", | ||
| exec{ command = [[find . -name "*~" -exec rm {} ';']] }, | ||
| delete{ dir = "bin" }, | ||
| delete{ dir = "build" }, | ||
| delete{ dir = "build_doc" }, | ||
| delete{ dir = "doxygen_doc" }, | ||
| }, | ||
| target{ name = "clean", | ||
| delete{ dir = "bin" }, | ||
| delete{ dir = "build" }, | ||
| delete{ dir = "build_doc" }, | ||
| }, | ||
| target{ name = "document_clean", | ||
| delete{ dir = "build_doc" }, | ||
| delete{ dir = "doxygen_doc" }, | ||
| }, | ||
| target{ | ||
| name = "build", | ||
| depends = "provide", | ||
| object{ | ||
| file = formiga.os.compose_dir("binding","c_src","*.cc"), | ||
| include_dirs = "include", | ||
| dest_dir = formiga.global_properties.build_dir, | ||
| }, | ||
| link_main_program{}, | ||
| create_static_library{}, | ||
| copy_header_files{}, | ||
| dot_graph{ | ||
| file_name = "dep_graph.dot" | ||
| }, | ||
| use_timestamp = true, | ||
| }, | ||
| target{ name = "document", | ||
| echo{"this is documentation"}, | ||
| main_documentation{ | ||
| dev_documentation = { | ||
| main_documentation_file = formiga.os.compose_dir("docs","april_dev.dox"), | ||
| doxygen_options = { | ||
| GENERATE_LATEX = 'NO', | ||
| }, | ||
| }, | ||
| user_documentation = { | ||
| main_documentation_file = formiga.os.compose_dir("docs","april_user_ref.dox"), | ||
| doxygen_options = { | ||
| GENERATE_LATEX = 'NO', | ||
| }, | ||
| } | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| if arg[2] == nil then | ||
| arg[2] = "." | ||
| end | ||
|
|
||
| formiga.os.execute("mkdir -p "..formiga.os.compose_dir(arg[2], "bin")) | ||
| formiga.os.execute("mkdir -p "..formiga.os.compose_dir(arg[2], "lib")) | ||
| formiga.os.execute("mkdir -p "..formiga.os.compose_dir(arg[2], "include")) | ||
| formiga.os.execute("cp -f "..formiga.os.compose_dir(formiga.build_dir,"bin",formiga.program_name) | ||
| .." "..formiga.os.compose_dir(arg[2], "bin", formiga.program_name)) | ||
| formiga.os.execute("cp -R "..formiga.os.compose_dir(formiga.build_dir,"lib") | ||
| .." "..arg[2]) | ||
| formiga.os.execute("cp -R "..formiga.os.compose_dir(formiga.build_dir,"include","april") | ||
| .." "..formiga.os.compose_dir(arg[2], "include")) | ||
|
|
Oops, something went wrong.