Skip to content

Commit

Permalink
Merge pull request #34 from StochasticAnalytics/get_baseline_from_pre…
Browse files Browse the repository at this point in the history 
…release

Get baseline from prerelease
  • Loading branch information
@bHimes
bHimes authored Oct 14, 2023
2 parents 7071608 + b42bbf8 commit 0de8fdd
Show file tree
Hide file tree
Showing 27 changed files with 4,056 additions and 3,991 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@ build/*
!build/build

include/nvidia-mathdx-*
include/cufftdx/

5 changes: 2 additions & 3 deletions .vscode_shared/BenHimes/c_cpp_properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"/groups/himesb/git/gemmi/include/**"
"/usr/local/cuda/include/**"
],
"defines": [
"_FILE_OFFSET_BITS=64",
"WXUSINGDLL",
"__WXGTK__",
"DEBUG"
],
"compilerPath": "/groups/himesb/intel/compilers_and_libraries_2020.2.254/linux/bin/intel64/icpc",
"cStandard": "c17",
"cppStandard": "c++17",
"browse": {
Expand All @@ -21,4 +20,4 @@
}
],
"version": 4
}
}
45 changes: 22 additions & 23 deletions .vscode_shared/BenHimes/settings.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
{
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools",
"C_Cpp.errorSquiggles": "Enabled",
"cmake.configureOnOpen": false,
"cmake.sourceDirectory": "${workspaceFolder}",
"cmake.buildDirectory": "${workspaceFolder}/build/${buildKit}/${buildType}",
"cmake.skipConfigureIfCachePresent": false,
"cmake.configureSettings": {
"BUILD_EXPERIMENTAL_FEATURES":true,
"BUILD_GPU_FEATURES":true,
"BUILD_STATIC_BINARIES":true,
"BUILD_OpenMP":true,
"cisTEM_CUDA_TOOLKIT_PATH":"/groups/cryoadmin/software/CUDA-TOOLKIT/cuda_11.3.1/"

},
"cmake.configureEnvironment": {
"WX_CONFIG":"/admin/software/wxWidgets3_static_GNU/bin/wx-config",
"CUDACXX":"/groups/cryoadmin/software/CUDA-TOOLKIT/cuda_11.3.1/bin/nvcc",
"CUDAARCHS":"70;75",
"CUDAFLAGS":" --default-stream per-thread -m64 --use_fast_math -Xptxas --warn-on-local-memory-usage,--warn-on-spills, --generate-line-info -Xcompiler= -DGPU -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1"


},
"C_Cpp.dimInactiveRegions": true,
"files.associations": {
"string": "cpp",
Expand Down Expand Up @@ -74,11 +54,30 @@
"typeinfo": "cpp",
"bit": "cpp",
"any": "cpp",
"map": "cpp"
"map": "cpp",
"bitset": "cpp",
"__hash_table": "cpp",
"__split_buffer": "cpp",
"queue": "cpp",
"stack": "cpp",
"codecvt": "cpp",
"condition_variable": "cpp",
"iomanip": "cpp",
"mutex": "cpp",
"thread": "cpp",
"cinttypes": "cpp",
"__nullptr": "cpp",
"compare": "cpp",
"concepts": "cpp",
"set": "cpp",
"numbers": "cpp",
"semaphore": "cpp",
"stop_token": "cpp",
"complex": "cpp",
"unordered_set": "cpp"
},
"C_Cpp.clang_format_path": "/usr/bin/clang-format-14",
"editor.formatOnSave": true,
"DockerRun.DisableDockerrc": true,
"html.format.endWithNewline": true
}

}
200 changes: 100 additions & 100 deletions .vscode_shared/BenHimes/tasks.json
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,101 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"options": {
"env": {
"cuda_dir": "/groups/cryoadmin/software/CUDA-TOOLKIT/cuda_11.3.1",
"wx_dir":"/groups/cryoadmin/software/WX/wx_static_3.05_",
"build_dir": "${workspaceFolder}/build",
"compile_cores": "48"
}
},
"tasks": [
{
"label": "Book_build",
"type": "shell",
"command": "/groups/himesb/.FastFFTDocs/bin/jupyter-book build --all ./docs && firefox ./docs/_build/html/index.html"
},
{
"label": "Book_publish",
"type": "shell",
"command": "cd docs && /groups/himesb/.FastFFTDocs/bin/ghp-import -n -p -f _build/html ; cd .."
},
{
"label": "echo",
"type": "shell",
"command": "echo --with-wx-config=${wx_dir}"
},
{
"label": "CONFIG intel,gpu,debug",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-debug && cd ${build_dir}/Intel-gpu-debug && CC=icc CXX=icpc ../../configure --enable-debugmode --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,debug",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-debug && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,debug,noexp",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-debug-noexp && cd ${build_dir}/Intel-gpu-debug-noexp && CC=icc CXX=icpc ../../configure --enable-debugmode --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,debug,noexp",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-debug-noexp && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,debug,rotate",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-debug-rotate && cd ${build_dir}/Intel-gpu-debug-rotate && CC=icc CXX=icpc ../../configure --enable-rotated-tm --enable-debugmode --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,debug,rotate",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-debug-rotate && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu && cd ${build_dir}/Intel-gpu && CC=icc CXX=icpc ../../configure --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,samples,debug",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-samples-debug && cd ${build_dir}/Intel-gpu-samples-debug && CC=icc CXX=icpc ../../configure --enable-samples --enable-debugmode --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,samples,debug",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-samples-debug && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,device-lto",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-lto && cd ${build_dir}/Intel-gpu-lto && CC=icc CXX=icpc ../../configure --with-oldest-gpu-arch=80 --with-target-gpu-arch=80 --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,device-lto",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-lto && make -j${compile_cores}"
},
{
"label": "CONFIG GNU ,gpu",
"type": "shell",
"command": "mkdir -p ${build_dir}/GNU-gpu && cd ${build_dir}/GNU-gpu && CC=gcc CXX=g++ ../../configure --disable-mkl --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}GNU/bin/wx-config"
},
{
"label": "BUILD GNU,gpu",
"type": "shell",
"command": "cd ${build_dir}/GNU-gpu && make -j${compile_cores}",
"problemMatcher": []
}
]
}
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"options": {
"env": {
"cuda_dir": "/groups/cryoadmin/software/CUDA-TOOLKIT/cuda_11.3.1",
"wx_dir": "/groups/cryoadmin/software/WX/wx_static_3.05_",
"build_dir": "${workspaceFolder}/build",
"compile_cores": "48"
}
},
"tasks": [
{
"label": "Book_build",
"type": "shell",
"command": "${HOME}/.FastFFTDocs/bin/jupyter-book build --all ./docs && firefox ./docs/_build/html/index.html"
},
{
"label": "Book_publish",
"type": "shell",
"command": "cd docs && ${HOME}/.FastFFTDocs/bin/ghp-import -n -p -f _build/html ; cd .."
},
{
"label": "echo",
"type": "shell",
"command": "echo --with-wx-config=${wx_dir}"
},
{
"label": "CONFIG intel,gpu,debug",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-debug && cd ${build_dir}/Intel-gpu-debug && CC=icc CXX=icpc ../../configure --enable-debugmode --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,debug",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-debug && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,debug,noexp",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-debug-noexp && cd ${build_dir}/Intel-gpu-debug-noexp && CC=icc CXX=icpc ../../configure --enable-debugmode --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,debug,noexp",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-debug-noexp && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,debug,rotate",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-debug-rotate && cd ${build_dir}/Intel-gpu-debug-rotate && CC=icc CXX=icpc ../../configure --enable-rotated-tm --enable-debugmode --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,debug,rotate",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-debug-rotate && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu && cd ${build_dir}/Intel-gpu && CC=icc CXX=icpc ../../configure --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,samples,debug",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-samples-debug && cd ${build_dir}/Intel-gpu-samples-debug && CC=icc CXX=icpc ../../configure --enable-samples --enable-debugmode --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,samples,debug",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-samples-debug && make -j${compile_cores}"
},
{
"label": "CONFIG intel,gpu,device-lto",
"type": "shell",
"command": "mkdir -p ${build_dir}/Intel-gpu-lto && cd ${build_dir}/Intel-gpu-lto && CC=icc CXX=icpc ../../configure --with-oldest-gpu-arch=80 --with-target-gpu-arch=80 --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}INTEL/bin/wx-config"
},
{
"label": "BUILD intel,gpu,device-lto",
"type": "shell",
"command": "cd ${build_dir}/Intel-gpu-lto && make -j${compile_cores}"
},
{
"label": "CONFIG GNU ,gpu",
"type": "shell",
"command": "mkdir -p ${build_dir}/GNU-gpu && cd ${build_dir}/GNU-gpu && CC=gcc CXX=g++ ../../configure --disable-mkl --enable-experimental --with-cuda=${cuda_dir} --enable-staticmode --enable-openmp --with-wx-config=${wx_dir}GNU/bin/wx-config"
},
{
"label": "BUILD GNU,gpu",
"type": "shell",
"command": "cd ${build_dir}/GNU-gpu && make -j${compile_cores}",
"problemMatcher": []
}
]
}
Loading

0 comments on commit 0de8fdd

Please sign in to comment.