Skip to content
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

Jump to bottom

New design thor #4

Open
wants to merge 129 commits into
base: master
Choose a base branch
from
Open

New design thor #4

wants to merge 129 commits into from

Conversation

athas
Copy link
Contributor

@athas athas commented Aug 28, 2015

I think this branch is ready to be master. While the work is not done, it works at least as well as the old master.

@athas
First draft of new implementation.
ac34a6b 
Not all benchmarks have been converted yet.
@athas
Standalone benchmark runner example.
49feee8
@athas
Fix test runner.
6668d7a
@athas
This file is not needed.
160f21d
@athas
Support platform-specific configuration.
eeba233
@athas
Lowercase filenames are preferable on Unix.
304d2e8
@athas
Accept some command line parameters.
e98929f
@athas
Report failed instantiations in a vaguely usable format.
aad4aa2
@athas
Fix error caused by variable shadowing.
32dacda 
Python is a bad language.
@athas
This one is obsolete.
de3c0f9
@athas
Use deepseq for proper timing.
177bc0b
@athas
Move GenericPricing to the brave new world.
39b43de
@athas
This kind of thing is not necessary anymore.
b60a0eb
@athas
More consistent naming.
69f1af9
@athas
Fix OpenCL implementations.
cf2c10d
@athas
Properly handle unrunnable instantiations.
d6bc7a9
@athas
Add Futhark implementation of CalibVolDiff.
4f4bc56
@athas
Add Futhark implementation of GenericPricing.
68ecaef
@athas
Merge branch 'master' into new-design
56bee71 
Conflicts:
	CalibVolDiff/Data/Small/input.data
	benchmarks/CalibVolDiff/datasets/small/output.json
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/VolCalibAll.cpp
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/VolCalibOuter.cpp
	benchmarks/CalibVolDiff/implementations/haskell_lh/VolCalib.hs
	platform.mk
@athas
Do not generate an optimised.fut file.
bd9518c
@athas
Use --in-place-lowering for Futhark implementation of GenericPricing.
168e2b1
@athas
We changed how split works.
ae1ff95
@athas
Update Futhark benchmarks to newest compiler version.
c21f4c3
@athas
Update CalibVolDiff to newest version.
ceff7b4
@athas
Fix 2D array printing.
74a80d2
@athas
Fix Futhark generic pricing.
e23456f
@athas
First draft of fixing CalibGA.
94bcf79
@athas
Merge branch 'master' into new-design
22e4b17 
This is not a full merge - many things are broken and not yet fully
updated.

Conflicts:
	CalibGA/All_CppOpenCL/FindBestKer.h
	CalibGA/All_CppOpenCL/GenAlgFlat.h
	CalibGA/All_CppOpenCL/GenAlgKers.h
	CalibGA/All_CppOpenCL/MainKer.h
	CalibGA/All_CppOpenCL/Makefile
	CalibGA/All_CppOpenCL/SrcCL/BestIndValRedKer.cl
	CalibGA/All_CppOpenCL/SrcCL/CalibKers.cl
	CalibGA/All_CppOpenCL/SrcCL/Date.cl
	CalibGA/All_CppOpenCL/SrcCL/ExactYhat.cl
	CalibGA/All_CppOpenCL/SrcCL/G2ppUtil.cl
	CalibGA/All_CppOpenCL/SrcCL/GenAlg.cl
	CalibGA/All_CppOpenCL/SrcCL/Reductions.cl
	CalibGA/All_CppOpenCL/SwapCalib.cpp
	CalibGA/All_CppOpenCL/UtilGPGPU.h
	CalibGA/Data/Medium/input.data
	CalibGA/Data/Small/input.data
	CalibGA/Outer_CppOpenMP/GenAlgFlat.h
	CalibGA/Outer_CppOpenMP/Makefile
	CalibGA/Outer_CppOpenMP/SwapCalib.cpp
	CalibGA/Outer_CppOpenMP/UtilCPU.h
	CalibGA/README.txt
	CalibGA/includeC/Candidate.h
	CalibGA/includeC/Constants.h
	CalibGA/includeC/Date.h
	CalibGA/includeC/EvalGenomeInl.h
	CalibGA/includeC/G2PP.h
	CalibGA/includeC/G2ppUtil.h
	CalibGA/includeC/GenAlgUtil.h
	CalibGA/includeC/IrregShape.h
	CalibGA/includeC/KerConsts.h
	CalibGA/includeC/MathModule.h
	CalibGA/includeC/tmp/Constants.h
	CalibGA/includeC/tmp/DataStructConst.h
	CalibGA/includeC/tmp/G2PP.h
	CalibVolDiff/All_COpenCLMP/CrankNicolson.cl
	CalibVolDiff/All_COpenCLMP/Makefile
	CalibVolDiff/All_COpenCLMP/PrepareKernels.h
	CalibVolDiff/All_COpenCLMP/Vect_CPU.h
	CalibVolDiff/All_COpenCLMP/Vect_GPU.h
	CalibVolDiff/All_COpenCLMP/VolCalibAll.cpp
	CalibVolDiff/All_COpenCLMP/VolCalibInit.h
	CalibVolDiff/Data/Medium/output.data
	CalibVolDiff/Data/Small/output.data
	CalibVolDiff/HaskellLH/VolCalib.hs
	CalibVolDiff/Original/Makefile
	CalibVolDiff/Outer_COpenCLMP/CrankNicolson.cl
	CalibVolDiff/Outer_COpenCLMP/Makefile
	CalibVolDiff/Outer_COpenCLMP/PrepareKernels.h
	CalibVolDiff/Outer_COpenCLMP/Vect_CPU.h
	CalibVolDiff/Outer_COpenCLMP/Vect_GPU.h
	CalibVolDiff/Outer_COpenCLMP/VolCalibInit.h
	CalibVolDiff/Outer_COpenCLMP/VolCalibOuter.cpp
	CalibVolDiff/README.txt
	CalibVolDiff/ToDo.txt
	CalibVolDiff/includeC/Constants.h
	CalibVolDiff/includeC/DataStructConst.h
	CalibVolDiff/includeC/ParPrefixUtil.h
	GenericPricing/CppOpenCL/ContractDefs/SmallContract.cl
	GenericPricing/CppOpenCL/GenPricing.cpp
	GenericPricing/CppOpenCL/GenericPricingPrivOpt.cl
	GenericPricing/CppOpenCL/GenericPricingVectOpt.cl
	GenericPricing/CppOpenCL/GenericPricingVectUncoalesced.cl
	GenericPricing/CppOpenCL/Makefile
	GenericPricing/CppOpenCL/StructGPU.h
	GenericPricing/HaskellLH/GenPricing.hs
	GenericPricing/HaskellLH/Payoff3Cond.hs
	GenericPricing/Orig_COpenMp/GenPricing.cpp
	GenericPricing/Orig_COpenMp/Makefile
	GenericPricing/Orig_COpenMp/SobolGaussBB.h
	GenericPricing/includeC/Constants.h
	GenericPricing/includeC/Optimizations.h
	GenericPricing/includeC/ParseInput.h
	GenericPricing/includeC/TimeHelper.h
	InterestCalib/CppOpenCL/FindBestKer.h
	InterestCalib/CppOpenCL/GenAlgFlat.h
	InterestCalib/CppOpenCL/GenAlgKers.h
	InterestCalib/CppOpenCL/MainKer.h
	InterestCalib/CppOpenCL/Makefile
	InterestCalib/CppOpenCL/SrcCL/BestIndValRedKer.cl
	InterestCalib/CppOpenCL/SrcCL/CalibKers.cl
	InterestCalib/CppOpenCL/SrcCL/Date.cl
	InterestCalib/CppOpenCL/SrcCL/ExactYhat.cl
	InterestCalib/CppOpenCL/SrcCL/G2ppUtil.cl
	InterestCalib/CppOpenCL/SrcCL/GenAlg.cl
	InterestCalib/CppOpenCL/SrcCL/Reductions.cl
	InterestCalib/CppOpenCL/SwapCalib.cpp
	InterestCalib/CppOpenCL/UtilGPGPU.h
	InterestCalib/CppOpenMP/GenAlgFlat.h
	InterestCalib/CppOpenMP/Makefile
	InterestCalib/CppOpenMP/SwapCalib.cpp
	InterestCalib/CppOpenMP/UtilCPU.h
	InterestCalib/Data/Large/input.data
	InterestCalib/Data/Large/output.data
	InterestCalib/Data/Small/input.data
	InterestCalib/Data/Small/output.data
	InterestCalib/README.txt
	InterestCalib/includeC/Candidate.h
	InterestCalib/includeC/Constants.h
	InterestCalib/includeC/Date.h
	InterestCalib/includeC/EvalGenomeInl.h
	InterestCalib/includeC/G2PP.h
	InterestCalib/includeC/G2ppUtil.h
	InterestCalib/includeC/GenAlgUtil.h
	InterestCalib/includeC/IrregShape.h
	InterestCalib/includeC/KerConsts.h
	InterestCalib/includeC/MathModule.h
	InterestCalib/includeC/ParseInput.h
	InterestCalib/includeC/tmp/Constants.h
	InterestCalib/includeC/tmp/DataStructConst.h
	InterestCalib/includeC/tmp/G2PP.h
	LocVolCalib/AllParOpenCLMP/CrankNicolson.cl
	LocVolCalib/AllParOpenCLMP/Makefile
	LocVolCalib/AllParOpenCLMP/PrepareKernels.h
	LocVolCalib/AllParOpenCLMP/Vect_CPU.h
	LocVolCalib/AllParOpenCLMP/Vect_GPU.h
	LocVolCalib/AllParOpenCLMP/VolCalibAll.cpp
	LocVolCalib/AllParOpenCLMP/VolCalibInit.h
	LocVolCalib/COpenMP/Makefile
	LocVolCalib/Data/Large/input.data
	LocVolCalib/Data/Medium/input.data
	LocVolCalib/Data/Medium/output.data
	LocVolCalib/Data/Small/output.data
	LocVolCalib/HaskellLH/Makefile
	LocVolCalib/HaskellLH/VolCalib.hs
	LocVolCalib/OrigCpp/Makefile
	LocVolCalib/OutParOpenCLMP/CrankNicolson.cl
	LocVolCalib/OutParOpenCLMP/Makefile
	LocVolCalib/OutParOpenCLMP/PrepareKernels.h
	LocVolCalib/OutParOpenCLMP/Vect_CPU.h
	LocVolCalib/OutParOpenCLMP/Vect_GPU.h
	LocVolCalib/OutParOpenCLMP/VolCalibInit.h
	LocVolCalib/OutParOpenCLMP/VolCalibOuter.cpp
	LocVolCalib/README.txt
	LocVolCalib/ToDo.txt
	LocVolCalib/includeC/Constants.h
	LocVolCalib/includeC/DataStructConst.h
	LocVolCalib/includeC/ParPrefixUtil.h
	LocVolCalib/includeC/ParseInput.h
	LocVolCalib/includeC/ParseInputOLD.h
	OptionPricing/CppOpenCL/ContractDefs/SmallContract.cl
	OptionPricing/CppOpenCL/GenPricing.cpp
	OptionPricing/CppOpenCL/GenericPricingPrivOpt.cl
	OptionPricing/CppOpenCL/GenericPricingVectOpt.cl
	OptionPricing/CppOpenCL/GenericPricingVectUncoalesced.cl
	OptionPricing/CppOpenCL/Makefile
	OptionPricing/CppOpenCL/StructGPU.h
	OptionPricing/CppOpenMP/GenPricing.cpp
	OptionPricing/CppOpenMP/Makefile
	OptionPricing/Data/Large/input.data
	OptionPricing/Data/Large/output.data
	OptionPricing/Data/Medium/input.data
	OptionPricing/Data/Medium/output.data
	OptionPricing/Data/Small/input.data
	OptionPricing/Data/Small/output.data
	OptionPricing/HaskellLH/GenPricing.hs
	OptionPricing/HaskellLH/Makefile
	OptionPricing/HaskellLH/Payoff3Cond.hs
	OptionPricing/includeC/Constants.h
	OptionPricing/includeC/Optimizations.h
	OptionPricing/includeC/ParseInput.h
	OptionPricing/includeC/SobolGaussBB.h
	OptionPricing/includeC/TimeHelper.h
	benchmarks/CalibGA/README.txt
	benchmarks/CalibGA/datasets/large/input.json
	benchmarks/CalibGA/datasets/medium/input.json
	benchmarks/CalibGA/datasets/small/input.json
	benchmarks/CalibGA/implementations/cpp_opencl_all/FindBestKer.h
	benchmarks/CalibGA/implementations/cpp_opencl_all/GenAlgFlat.h
	benchmarks/CalibGA/implementations/cpp_opencl_all/GenAlgKers.h
	benchmarks/CalibGA/implementations/cpp_opencl_all/MainKer.h
	benchmarks/CalibGA/implementations/cpp_opencl_all/Makefile
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/BestIndValRedKer.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/CalibKers.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/Date.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/ExactYhat.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/G2ppUtil.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/GenAlg.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SrcCL/Reductions.cl
	benchmarks/CalibGA/implementations/cpp_opencl_all/SwapCalib.cpp
	benchmarks/CalibGA/implementations/cpp_opencl_all/UtilGPGPU.h
	benchmarks/CalibGA/implementations/cpp_openmp_outer/GenAlgFlat.h
	benchmarks/CalibGA/implementations/cpp_openmp_outer/Makefile
	benchmarks/CalibGA/implementations/cpp_openmp_outer/SwapCalib.cpp
	benchmarks/CalibGA/implementations/cpp_openmp_outer/UtilCPU.h
	benchmarks/CalibGA/lib/include/Candidate.h
	benchmarks/CalibGA/lib/include/Constants.h
	benchmarks/CalibGA/lib/include/Date.h
	benchmarks/CalibGA/lib/include/EvalGenomeInl.h
	benchmarks/CalibGA/lib/include/G2PP.h
	benchmarks/CalibGA/lib/include/G2ppUtil.h
	benchmarks/CalibGA/lib/include/GenAlgUtil.h
	benchmarks/CalibGA/lib/include/IrregShape.h
	benchmarks/CalibGA/lib/include/KerConsts.h
	benchmarks/CalibGA/lib/include/MathModule.h
	benchmarks/CalibGA/lib/include/tmp/Constants.h
	benchmarks/CalibGA/lib/include/tmp/DataStructConst.h
	benchmarks/CalibGA/lib/include/tmp/G2PP.h
	benchmarks/CalibVolDiff/README.txt
	benchmarks/CalibVolDiff/ToDo.txt
	benchmarks/CalibVolDiff/datasets/large/output.json
	benchmarks/CalibVolDiff/datasets/medium/output.json
	benchmarks/CalibVolDiff/datasets/small/output.json
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/CrankNicolson.cl
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/Makefile
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/PrepareKernels.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/Vect_CPU.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/Vect_GPU.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/VolCalibAll.cpp
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_all/VolCalibInit.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/CrankNicolson.cl
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/Makefile
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/PrepareKernels.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/Vect_CPU.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/Vect_GPU.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/VolCalibInit.h
	benchmarks/CalibVolDiff/implementations/cpp_openclmp_outer/VolCalibOuter.cpp
	benchmarks/CalibVolDiff/implementations/cpp_openmp_naive/VolCalibOrig.cpp
	benchmarks/CalibVolDiff/implementations/cpp_sequential/Makefile
	benchmarks/CalibVolDiff/implementations/cpp_sequential/VolCalibOrig.cpp
	benchmarks/CalibVolDiff/implementations/haskell_lh/VolCalib.hs
	benchmarks/CalibVolDiff/lib/include/Constants.h
	benchmarks/CalibVolDiff/lib/include/DataStructConst.h
	benchmarks/CalibVolDiff/lib/include/ParPrefixUtil.h
	benchmarks/GenericPricing/implementations/cpp_opencl/ContractDefs/LargeContract.cl
	benchmarks/GenericPricing/implementations/cpp_opencl/ContractDefs/MediumContract.cl
	benchmarks/GenericPricing/implementations/cpp_opencl/ContractDefs/SmallContract.cl
	benchmarks/GenericPricing/implementations/cpp_opencl/GenPricing.cpp
	benchmarks/GenericPricing/implementations/cpp_opencl/GenericPricingPrivOpt.cl
	benchmarks/GenericPricing/implementations/cpp_opencl/GenericPricingVectOpt.cl
	benchmarks/GenericPricing/implementations/cpp_opencl/GenericPricingVectUncoalesced.cl
	benchmarks/GenericPricing/implementations/cpp_opencl/Makefile
	benchmarks/GenericPricing/implementations/cpp_opencl/StructGPU.h
	benchmarks/GenericPricing/implementations/cpp_openmp/Contracts.h
	benchmarks/GenericPricing/implementations/cpp_openmp/GenPricing.cpp
	benchmarks/GenericPricing/implementations/cpp_openmp/Makefile
	benchmarks/GenericPricing/implementations/cpp_openmp/SobolGaussBB.h
	benchmarks/GenericPricing/implementations/haskell_lh/GenPricing.hs
	benchmarks/GenericPricing/implementations/haskell_lh/Payoff3Cond.hs
	benchmarks/GenericPricing/lib/Constants.h
	benchmarks/GenericPricing/lib/Optimizations.h
	benchmarks/GenericPricing/lib/ParseInput.h
	benchmarks/GenericPricing/lib/TimeHelper.h
	docs/Jepsen_Report.pdf
	docs/TridagPres.pdf
	lib/include/SDK_stub.h
@athas
LocVolCalib fixes.
40124ad
@athas
Comment notation changed.
df23a9f
@athas
Copy link
Contributor Author

athas commented Aug 31, 2015

We'll need to fix the documentation before we can merge.

athas and others added 29 commits September 1, 2015 16:15
@athas
Add ad-hoc run_%s targets.
6ed9d2a
@athas
Newer hipermark.
2ee9833
Added configuration file for producing graphs with hiperpret
75bc73e
One more figure is now produced by hiperpret
17827b7
Many graphs are now produced.
6ee7fb7
Two graphs with dataset as indep. var. is now defined in JSON and pro…
db5a99a 
…duced by hiperpret.
@athas
Fix hipermark submodule.
d4bdc33
@Sword-Smith
hiperpret figure configuration file format changed to list of dicts.
b096c1b
@Sword-Smith
figure configuration file updated to fit new hiperpret program.
a45b1bf
@Sword-Smith
Removed sticky keyword from JSON parsing for graph generation. Each J…
f0438cd 
…SON now produces one figure
@Sword-Smith
finpar configuration files for working with underspecified hiperpret …
3fe06ac 
…figures have been added
@Sword-Smith
Script for printing runtimes bar chart now handles two implementation…
ff9b927 
…s of OptionPricing benchmark.
@Sword-Smith
Added dynamic compile time options for OptionPricing/cpp_opencl
8e2e50a
@Sword-Smith
Editing source code cpp_opencl for vectorization stuff
ea0eb0e
Better scripts and better graph definition files
b91d7de
Added script for running HIPERpret on OpenCL output
107ed04
Better runtime bar diagrams for OpenCL runs
0acd927
Changed scripts to handle new input format for HIPERmark
5d8f0ce
script
a0f7d98
@athas
We measure microseconds now.
34a62b7
@athas
Do not touch!
8c62fc8
@athas
Measure InterestCalib runtimes in microseconds.
281e5cf
@athas
Measure LocVolCalib runtimes in microseconds.
26e2a51
@athas
Add missing initialisation.
693e02b
@athas
ULONG does not exist anymore.
712eee8
@coancea
small changes, adding option for memory coalesced or not
a3e2728
@coancea
Merge branch 'new-design-Thor' of github.com:HIPERFIT/finpar into new…
0362eb0 
…-design-Thor
@coancea
various fixes
a0a04ef
@coancea
enabled strength reduction
7e00cdc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@athas @Sword-Smith @coancea