Open
Conversation
Not all benchmarks have been converted yet.
Python is a bad language.
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
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
Contributor
Author
|
We'll need to fix the documentation before we can merge. |
…duced by hiperpret.
…SON now produces one figure
…figures have been added
…s of OptionPricing benchmark.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.