From 775c750552576299b3d232298f8037fe813bdc51 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 11:57:20 +0100 Subject: Remove unused Cuda.rules file --- build/Cuda.rules | 358 ------------------------------------------------------- 1 file changed, 358 deletions(-) delete mode 100644 build/Cuda.rules diff --git a/build/Cuda.rules b/build/Cuda.rules deleted file mode 100644 index 733aa1f..0000000 --- a/build/Cuda.rules +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From b72eaca5e13bb239aec8a911979465f2db9b4691 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:01:15 +0100 Subject: Switch to CUDA 8.0 --- build/msvc/gen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/msvc/gen.py b/build/msvc/gen.py index cc69a62..8fbfaa0 100644 --- a/build/msvc/gen.py +++ b/build/msvc/gen.py @@ -567,7 +567,7 @@ def write_project11_start(P, F): print(' ', file=F) print(' ', file=F) if "mex" not in P["name"]: - print(' ', file=F) + print(' ', file=F) print(' ', file=F) for c in configs: print(''' ''' % (c.name(), ), file=F) @@ -614,7 +614,7 @@ def write_project11_end(P, F): print(' ', file=F) print(' ', file=F) if "mex" not in P["name"]: - print(' ', file=F) + print(' ', file=F) print(' ', file=F) print('', end="", file=F) -- cgit v1.2.3 From d1651c8f753586d1c2f58fcff8531684392f98ff Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:12:03 +0100 Subject: Update CUDA archs --- build/msvc/gen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/msvc/gen.py b/build/msvc/gen.py index 8fbfaa0..db44c77 100644 --- a/build/msvc/gen.py +++ b/build/msvc/gen.py @@ -690,7 +690,7 @@ def write_main_project11(): else: print(' 32', file=F) print(' true', file=F) - print(' compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30', file=F) + print(' compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60', file=F) print(' ', file=F) print(' ', file=F) write_project11_end(P, F) -- cgit v1.2.3 From 57efb1157d06150733a651dc40b8702941e30d3c Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:12:51 +0100 Subject: Update gen.py for VS2015 --- build/msvc/gen.py | 117 ++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 78 insertions(+), 39 deletions(-) diff --git a/build/msvc/gen.py b/build/msvc/gen.py index db44c77..8a40c45 100644 --- a/build/msvc/gen.py +++ b/build/msvc/gen.py @@ -12,26 +12,28 @@ siguid = "2150E333-8FDC-42A3-9474-1A3956D46DE8" # project group # import uuid # uuid.uuid4().__str__().upper() -def create_mex_project(name, uuid11, uuid09): - return { "type": vcppguid, "name": name, "file11": "matlab\\mex\\" + name + "_vc11.vcxproj", "file09": "matlab\\mex\\" + name + "_vc09.vcproj", "uuid11": uuid11, "uuid09": uuid09, "files": [] } +def create_mex_project(name, uuid14, uuid11, uuid09): + return { "type": vcppguid, "name": name, "file14": "matlab\\mex\\" + name + "_vc14.vcxproj", "file11": "matlab\\mex\\" + name + "_vc11.vcxproj", "file09": "matlab\\mex\\" + name + "_vc09.vcproj", "uuid14": uuid14, "uuid11": uuid11, "uuid09": uuid09, "files": [] } -P_astra = { "type": vcppguid, "name": "astra_vc11", "file11": "astra_vc11.vcxproj", "file09": "astra_vc09.vcproj", "uuid11": "BE9F1326-527C-4284-AE2C-D1E25D539CEA", "uuid09": "12926444-6723-46A8-B388-12E65E0577FA" } +P_astra = { "type": vcppguid, "name": "astra_vc11", "file14": "astra_vc14.vcxproj", "file11": "astra_vc11.vcxproj", "file09": "astra_vc09.vcproj", "uuid14": "DABD9D82-609E-4C71-B1CA-A41B07495290", "uuid11": "BE9F1326-527C-4284-AE2C-D1E25D539CEA", "uuid09": "12926444-6723-46A8-B388-12E65E0577FA" } -P0 = create_mex_project("astra_mex", "3FDA35E0-0D54-4663-A3E6-5ABA96F32221", "3FDA35E0-0D54-4663-A3E6-5ABA96F32221") +P0 = create_mex_project("astra_mex", "6FDF72C4-A855-4F1C-A401-6500040B5E28", "3FDA35E0-0D54-4663-A3E6-5ABA96F32221", "3FDA35E0-0D54-4663-A3E6-5ABA96F32221") -P1 = create_mex_project("astra_mex_algorithm", "056BF7A9-294D-487C-8CC3-BE629077CA94", "056BF7A9-294D-487C-8CC3-BE629077CA94") -P2 = create_mex_project("astra_mex_data2d", "E4092269-B19C-46F7-A84E-4F146CC70E44", "E4092269-B19C-46F7-A84E-4F146CC70E44") -P3 = create_mex_project("astra_mex_data3d", "0BEC029B-0929-4BF9-BD8B-9C9806A52065", "0BEC029B-0929-4BF9-BD8B-9C9806A52065") -P4 = create_mex_project("astra_mex_matrix", "9D041710-2119-4230-BCF2-5FBE753FDE49", "9D041710-2119-4230-BCF2-5FBE753FDE49") -P5 = create_mex_project("astra_mex_projector", "4DD6056F-8EEE-4C9A-B2A9-923F01A32E97", "4DD6056F-8EEE-4C9A-B2A9-923F01A32E97") -P6 = create_mex_project("astra_mex_projector3d", "F94CCD79-AA11-42DF-AC8A-6C9D2238A883", "F94CCD79-AA11-42DF-AC8A-6C9D2238A883") -P7 = create_mex_project("astra_mex_log", "03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E", "CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8") -P8 = create_mex_project("astra_mex_direct", "0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7", "85FE09A6-FA49-4314-A2B1-59D77C7442A8") +P1 = create_mex_project("astra_mex_algorithm", "CE5EF874-830C-4C10-8651-CCA2A34ED9E4", "056BF7A9-294D-487C-8CC3-BE629077CA94", "056BF7A9-294D-487C-8CC3-BE629077CA94") +P2 = create_mex_project("astra_mex_data2d", "D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1", "E4092269-B19C-46F7-A84E-4F146CC70E44", "E4092269-B19C-46F7-A84E-4F146CC70E44") +P3 = create_mex_project("astra_mex_data3d", "2A7084C6-62ED-4235-85F4-094C17689DEB", "0BEC029B-0929-4BF9-BD8B-9C9806A52065", "0BEC029B-0929-4BF9-BD8B-9C9806A52065") +P4 = create_mex_project("astra_mex_matrix", "6BFA8857-37EB-4E43-A97C-B860E21599F5", "9D041710-2119-4230-BCF2-5FBE753FDE49", "9D041710-2119-4230-BCF2-5FBE753FDE49") +P5 = create_mex_project("astra_mex_projector", "85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2", "4DD6056F-8EEE-4C9A-B2A9-923F01A32E97", "4DD6056F-8EEE-4C9A-B2A9-923F01A32E97") +P6 = create_mex_project("astra_mex_projector3d", "CA85BDA0-9BDD-495E-B200-BFE863EB6318", "F94CCD79-AA11-42DF-AC8A-6C9D2238A883", "F94CCD79-AA11-42DF-AC8A-6C9D2238A883") +P7 = create_mex_project("astra_mex_log", "88539382-66DB-4BBC-A48E-8B6B3CA6064F", "03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E", "CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8") +P8 = create_mex_project("astra_mex_direct", "47460476-912B-4313-8B10-BDF1D60A84C4", "0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7", "85FE09A6-FA49-4314-A2B1-59D77C7442A8") F_astra_mex = { "type": siguid, "name": "astra_mex", + "file14": "astra_mex", "file11": "astra_mex", "file09": "astra_mex", + "uuid14": "2076FB73-ECFE-4B1B-9A8C-E351C500FAAB", "uuid11": "5E99A109-374E-4102-BE9B-99BA1FA8AA30", "uuid09": "33EF0AC5-B475-40BF-BAE5-67075B204D10", "entries": [ P0, P1, P2, P3, P4, P5, P6, P7, P8 ] } @@ -483,6 +485,8 @@ def write_sln(version): F = open("astra_vc09.sln", "w") elif version == 11: F = open("astra_vc11.sln", "w") + elif version == 14: + F = open("astra_vc14.sln", "w") else: assert(False) print(bom, file=F) @@ -496,6 +500,13 @@ def write_sln(version): print("# Visual Studio 2012", file=F) uuid = "uuid11" file_ = "file11" + elif version == 14: + print("Microsoft Visual Studio Solution File, Format Version 12.00", file=F) + print("# Visual Studio 14", file=F) + print("VisualStudioVersion = 14.0.25420.1", file=F) + print("MinimumVisualStudioVersion = 10.0.40219.1", file=F) + uuid = "uuid14" + file_ = "file14" for p in projects: s = '''Project("{%s}") = "%s", "%s", "{%s}"''' % (p["type"], p["name"], p[file_], p[uuid]) print(s, file=F) @@ -530,7 +541,7 @@ def write_sln(version): print("EndGlobal", file=F) F.close() -def write_project11_start(P, F): +def write_project11_14_start(P, F, version): print(bom + '', file=F) print('', file=F) print(' ', file=F) @@ -543,7 +554,10 @@ def write_project11_start(P, F): print(' ', file=F) if 'mex' in P["name"]: print(' ' + P["name"] + '', file=F) - print(' {' + P["uuid11"] + '}', file=F) + if version == 11: + print(' {' + P["uuid11"] + '}', file=F) + else: + print(' {' + P["uuid14"] + '}', file=F) if 'mex' in P["name"]: print(' astraMatlab', file=F) else: @@ -558,7 +572,10 @@ def write_project11_start(P, F): print(' true', file=F) else: print(' false', file=F) - print(' v110', file=F) + if version == 11: + print(' v110', file=F) + else: + print(' v140', file=F) if 'mex' not in P["name"]: if not c.debug: print(' true', file=F) @@ -575,7 +592,7 @@ def write_project11_start(P, F): print(''' ''', file=F) print(' ', file=F) -def write_project11_end(P, F): +def write_project11_14_end(P, F): l = [ f for f in P["files"] if len(f) > 4 and f[-4:] == ".cpp" ] if l: print(' ', file=F) @@ -619,13 +636,16 @@ def write_project11_end(P, F): print('', end="", file=F) -def write_main_project11(): +def write_main_project11_14(version): P = P_astra; - F = open(P["file11"], "w") - write_project11_start(P, F) + if version == 11: + F = open(P["file11"], "w") + else: + F = open(P["file14"], "w") + write_project11_14_start(P, F, version) for c in configs: print(''' ''' % (c.name(), ), file=F) - if c.cuda: + if c.cuda and version == 11: print(' $(CUDA_INC_PATH);$(IncludePath)', file=F) print(' $(CUDA_LIB_PATH);$(LibraryPath)', file=F) print(' $(SolutionDir)bin\\$(Platform)\\' + c.config() + '\\', file=F) @@ -693,12 +713,15 @@ def write_main_project11(): print(' compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60', file=F) print(' ', file=F) print(' ', file=F) - write_project11_end(P, F) + write_project11_14_end(P, F) F.close() -def write_mex_project11(P): - F = open("matlab/mex/" + P["name"] + "_vc11.vcxproj", "w") - write_project11_start(P, F) +def write_mex_project11_14(P, version): + if version == 11: + F = open("matlab/mex/" + P["name"] + "_vc11.vcxproj", "w") + else: + F = open("matlab/mex/" + P["name"] + "_vc14.vcxproj", "w") + write_project11_14_start(P, F, version) print(' ', file=F) print(' <_ProjectFileVersion>11.0.60610.1', file=F) print(' ', file=F) @@ -772,10 +795,10 @@ def write_mex_project11(P): print(' true', file=F) print(' ', file=F) print(' ', file=F) - write_project11_end(P, F) + write_project11_14_end(P, F) F.close() -def write_main_filters11(): +def write_main_filters11_14(): P = P_astra F = open(P["name"] + ".vcxproj.filters", "w") print(bom + '', file=F) @@ -1106,8 +1129,8 @@ def write_mex_project09(P): -if (len(sys.argv) != 2) or (sys.argv[1] not in ["vc09", "vc11", "all"]): - print("Usage: python gen.py [vc09|vc11|all]", file=sys.stderr) +if (len(sys.argv) != 2) or (sys.argv[1] not in ["vc09", "vc11", "vc14", "all"]): + print("Usage: python gen.py [vc09|vc11|vc14|all]", file=sys.stderr) sys.exit(1) @@ -1121,21 +1144,37 @@ except IOError: # Change directory to main dir os.chdir("../..") +if sys.argv[1] in ["vc14", "all"]: + # HACK + P_astra["name"] = "astra_vc14" + write_sln(14) + write_main_project11_14(14) + write_main_filters11_14() + write_mex_project11_14(P0, 14) + write_mex_project11_14(P1, 14) + write_mex_project11_14(P2, 14) + write_mex_project11_14(P3, 14) + write_mex_project11_14(P4, 14) + write_mex_project11_14(P5, 14) + write_mex_project11_14(P6, 14) + write_mex_project11_14(P7, 14) + write_mex_project11_14(P8, 14) + if sys.argv[1] in ["vc11", "all"]: # HACK P_astra["name"] = "astra_vc11" write_sln(11) - write_main_project11() - write_main_filters11() - write_mex_project11(P0) - write_mex_project11(P1) - write_mex_project11(P2) - write_mex_project11(P3) - write_mex_project11(P4) - write_mex_project11(P5) - write_mex_project11(P6) - write_mex_project11(P7) - write_mex_project11(P8) + write_main_project11_14(11) + write_main_filters11_14() + write_mex_project11_14(P0, 11) + write_mex_project11_14(P1, 11) + write_mex_project11_14(P2, 11) + write_mex_project11_14(P3, 11) + write_mex_project11_14(P4, 11) + write_mex_project11_14(P5, 11) + write_mex_project11_14(P6, 11) + write_mex_project11_14(P7, 11) + write_mex_project11_14(P8, 11) if sys.argv[1] in ["vc09", "all"]: # HACK -- cgit v1.2.3 From aec75045ce5394eec3ecc0137ec1b821f6059f77 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:14:10 +0100 Subject: Remove VS2008/VS2012 build files --- astra_vc09.sln | 243 -- astra_vc09.vcproj | 3248 ------------------------- astra_vc11.sln | 243 -- astra_vc11.vcxproj | 857 ------- astra_vc11.vcxproj.filters | 766 ------ matlab/mex/astra_mex_algorithm_vc09.vcproj | 612 ----- matlab/mex/astra_mex_algorithm_vc11.vcxproj | 306 --- matlab/mex/astra_mex_data2d_vc09.vcproj | 628 ----- matlab/mex/astra_mex_data2d_vc11.vcxproj | 310 --- matlab/mex/astra_mex_data3d_vc09.vcproj | 628 ----- matlab/mex/astra_mex_data3d_vc11.vcxproj | 310 --- matlab/mex/astra_mex_direct_vc09.vcproj | 628 ----- matlab/mex/astra_mex_direct_vc11.vcxproj | 310 --- matlab/mex/astra_mex_file_vc11.vcxproj | 289 --- matlab/mex/astra_mex_log_vc09.vcproj | 612 ----- matlab/mex/astra_mex_log_vc11.vcxproj | 306 --- matlab/mex/astra_mex_matrix_vc09.vcproj | 612 ----- matlab/mex/astra_mex_matrix_vc11.vcxproj | 306 --- matlab/mex/astra_mex_projector3d_vc09.vcproj | 612 ----- matlab/mex/astra_mex_projector3d_vc11.vcxproj | 306 --- matlab/mex/astra_mex_projector_vc09.vcproj | 612 ----- matlab/mex/astra_mex_projector_vc11.vcxproj | 306 --- matlab/mex/astra_mex_vc09.vcproj | 612 ----- matlab/mex/astra_mex_vc11.vcxproj | 306 --- 24 files changed, 13968 deletions(-) delete mode 100644 astra_vc09.sln delete mode 100644 astra_vc09.vcproj delete mode 100644 astra_vc11.sln delete mode 100644 astra_vc11.vcxproj delete mode 100644 astra_vc11.vcxproj.filters delete mode 100644 matlab/mex/astra_mex_algorithm_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_algorithm_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_data2d_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_data2d_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_data3d_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_data3d_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_direct_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_direct_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_file_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_log_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_log_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_matrix_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_matrix_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_projector3d_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_projector3d_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_projector_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_projector_vc11.vcxproj delete mode 100644 matlab/mex/astra_mex_vc09.vcproj delete mode 100644 matlab/mex/astra_mex_vc11.vcxproj diff --git a/astra_vc09.sln b/astra_vc09.sln deleted file mode 100644 index 371e9b1..0000000 --- a/astra_vc09.sln +++ /dev/null @@ -1,243 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra", "astra_vc09.vcproj", "{12926444-6723-46A8-B388-12E65E0577FA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{33EF0AC5-B475-40BF-BAE5-67075B204D10}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc09.vcproj", "{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc09.vcproj", "{056BF7A9-294D-487C-8CC3-BE629077CA94}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc09.vcproj", "{E4092269-B19C-46F7-A84E-4F146CC70E44}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc09.vcproj", "{0BEC029B-0929-4BF9-BD8B-9C9806A52065}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc09.vcproj", "{9D041710-2119-4230-BCF2-5FBE753FDE49}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc09.vcproj", "{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc09.vcproj", "{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_log", "matlab\mex\astra_mex_log_vc09.vcproj", "{CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_direct", "matlab\mex\astra_mex_direct_vc09.vcproj", "{85FE09A6-FA49-4314-A2B1-59D77C7442A8}" - ProjectSection(ProjectDependencies) = postProject - {12926444-6723-46A8-B388-12E65E0577FA} = {12926444-6723-46A8-B388-12E65E0577FA} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_CUDA|Win32 = Debug_CUDA|Win32 - Debug_CUDA|x64 = Debug_CUDA|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_CUDA|Win32 = Release_CUDA|Win32 - Release_CUDA|x64 = Release_CUDA|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|Win32.ActiveCfg = Debug|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|Win32.Build.0 = Debug|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|x64.ActiveCfg = Debug|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Debug|x64.Build.0 = Debug|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|Win32.ActiveCfg = Release|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|Win32.Build.0 = Release|Win32 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|x64.ActiveCfg = Release|x64 - {12926444-6723-46A8-B388-12E65E0577FA}.Release|x64.Build.0 = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.Build.0 = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.ActiveCfg = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.Build.0 = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.ActiveCfg = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.Build.0 = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.ActiveCfg = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.Build.0 = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.ActiveCfg = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.Build.0 = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.ActiveCfg = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.Build.0 = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.ActiveCfg = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.Build.0 = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.ActiveCfg = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.Build.0 = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.Build.0 = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.ActiveCfg = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.Build.0 = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.ActiveCfg = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.Build.0 = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.ActiveCfg = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.Build.0 = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.ActiveCfg = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.Build.0 = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.ActiveCfg = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.Build.0 = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.ActiveCfg = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.Build.0 = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.ActiveCfg = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.Build.0 = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.Build.0 = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.ActiveCfg = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.Build.0 = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.ActiveCfg = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.Build.0 = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.ActiveCfg = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.Build.0 = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.Build.0 = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.ActiveCfg = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.Build.0 = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.ActiveCfg = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.Build.0 = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.ActiveCfg = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.Build.0 = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.ActiveCfg = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.Build.0 = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.ActiveCfg = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.Build.0 = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.ActiveCfg = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.Build.0 = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.ActiveCfg = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.Build.0 = Release|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|Win32.ActiveCfg = Debug|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|Win32.Build.0 = Debug|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|x64.ActiveCfg = Debug|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Debug|x64.Build.0 = Debug|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|Win32.ActiveCfg = Release|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|Win32.Build.0 = Release|Win32 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|x64.ActiveCfg = Release|x64 - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8}.Release|x64.Build.0 = Release|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|Win32.ActiveCfg = Debug|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|Win32.Build.0 = Debug|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|x64.ActiveCfg = Debug|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Debug|x64.Build.0 = Debug|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|Win32.ActiveCfg = Release|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|Win32.Build.0 = Release|Win32 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|x64.ActiveCfg = Release|x64 - {85FE09A6-FA49-4314-A2B1-59D77C7442A8}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {056BF7A9-294D-487C-8CC3-BE629077CA94} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {E4092269-B19C-46F7-A84E-4F146CC70E44} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {0BEC029B-0929-4BF9-BD8B-9C9806A52065} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {9D041710-2119-4230-BCF2-5FBE753FDE49} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {CA2840B3-DA68-41B5-AC57-F5DFD20ED8F8} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - {85FE09A6-FA49-4314-A2B1-59D77C7442A8} = {33EF0AC5-B475-40BF-BAE5-67075B204D10} - EndGlobalSection -EndGlobal diff --git a/astra_vc09.vcproj b/astra_vc09.vcproj deleted file mode 100644 index f2cf62a..0000000 --- a/astra_vc09.vcproj +++ /dev/null @@ -1,3248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/astra_vc11.sln b/astra_vc11.sln deleted file mode 100644 index 92fb584..0000000 --- a/astra_vc11.sln +++ /dev/null @@ -1,243 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_vc11", "astra_vc11.vcxproj", "{BE9F1326-527C-4284-AE2C-D1E25D539CEA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{5E99A109-374E-4102-BE9B-99BA1FA8AA30}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc11.vcxproj", "{3FDA35E0-0D54-4663-A3E6-5ABA96F32221}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc11.vcxproj", "{056BF7A9-294D-487C-8CC3-BE629077CA94}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc11.vcxproj", "{E4092269-B19C-46F7-A84E-4F146CC70E44}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc11.vcxproj", "{0BEC029B-0929-4BF9-BD8B-9C9806A52065}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc11.vcxproj", "{9D041710-2119-4230-BCF2-5FBE753FDE49}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc11.vcxproj", "{4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc11.vcxproj", "{F94CCD79-AA11-42DF-AC8A-6C9D2238A883}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_log", "matlab\mex\astra_mex_log_vc11.vcxproj", "{03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_direct", "matlab\mex\astra_mex_direct_vc11.vcxproj", "{0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}" - ProjectSection(ProjectDependencies) = postProject - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} = {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_CUDA|Win32 = Debug_CUDA|Win32 - Debug_CUDA|x64 = Debug_CUDA|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release_CUDA|Win32 = Release_CUDA|Win32 - Release_CUDA|x64 = Release_CUDA|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|Win32.Build.0 = Debug|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|x64.ActiveCfg = Debug|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Debug|x64.Build.0 = Debug|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|Win32.ActiveCfg = Release|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|Win32.Build.0 = Release|Win32 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|x64.ActiveCfg = Release|x64 - {BE9F1326-527C-4284-AE2C-D1E25D539CEA}.Release|x64.Build.0 = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|Win32.Build.0 = Debug|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.ActiveCfg = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Debug|x64.Build.0 = Debug|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.ActiveCfg = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|Win32.Build.0 = Release|Win32 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.ActiveCfg = Release|x64 - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221}.Release|x64.Build.0 = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.ActiveCfg = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|Win32.Build.0 = Debug|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.ActiveCfg = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Debug|x64.Build.0 = Debug|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.ActiveCfg = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|Win32.Build.0 = Release|Win32 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.ActiveCfg = Release|x64 - {056BF7A9-294D-487C-8CC3-BE629077CA94}.Release|x64.Build.0 = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.ActiveCfg = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|Win32.Build.0 = Debug|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.ActiveCfg = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Debug|x64.Build.0 = Debug|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.ActiveCfg = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|Win32.Build.0 = Release|Win32 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.ActiveCfg = Release|x64 - {E4092269-B19C-46F7-A84E-4F146CC70E44}.Release|x64.Build.0 = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.ActiveCfg = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|Win32.Build.0 = Debug|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.ActiveCfg = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Debug|x64.Build.0 = Debug|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.ActiveCfg = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|Win32.Build.0 = Release|Win32 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.ActiveCfg = Release|x64 - {0BEC029B-0929-4BF9-BD8B-9C9806A52065}.Release|x64.Build.0 = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.ActiveCfg = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|Win32.Build.0 = Debug|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.ActiveCfg = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Debug|x64.Build.0 = Debug|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.ActiveCfg = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|Win32.Build.0 = Release|Win32 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.ActiveCfg = Release|x64 - {9D041710-2119-4230-BCF2-5FBE753FDE49}.Release|x64.Build.0 = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.ActiveCfg = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|Win32.Build.0 = Debug|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.ActiveCfg = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Debug|x64.Build.0 = Debug|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.ActiveCfg = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|Win32.Build.0 = Release|Win32 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.ActiveCfg = Release|x64 - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97}.Release|x64.Build.0 = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.ActiveCfg = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|Win32.Build.0 = Debug|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.ActiveCfg = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Debug|x64.Build.0 = Debug|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.ActiveCfg = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|Win32.Build.0 = Release|Win32 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.ActiveCfg = Release|x64 - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883}.Release|x64.Build.0 = Release|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|Win32.ActiveCfg = Debug|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|Win32.Build.0 = Debug|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|x64.ActiveCfg = Debug|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Debug|x64.Build.0 = Debug|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|Win32.ActiveCfg = Release|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|Win32.Build.0 = Release|Win32 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|x64.ActiveCfg = Release|x64 - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E}.Release|x64.Build.0 = Release|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|Win32.Build.0 = Debug|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|x64.ActiveCfg = Debug|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Debug|x64.Build.0 = Debug|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|Win32.ActiveCfg = Release|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|Win32.Build.0 = Release|Win32 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|x64.ActiveCfg = Release|x64 - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {056BF7A9-294D-487C-8CC3-BE629077CA94} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {E4092269-B19C-46F7-A84E-4F146CC70E44} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {0BEC029B-0929-4BF9-BD8B-9C9806A52065} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {9D041710-2119-4230-BCF2-5FBE753FDE49} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7} = {5E99A109-374E-4102-BE9B-99BA1FA8AA30} - EndGlobalSection -EndGlobal diff --git a/astra_vc11.vcxproj b/astra_vc11.vcxproj deleted file mode 100644 index d050b96..0000000 --- a/astra_vc11.vcxproj +++ /dev/null @@ -1,857 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - {BE9F1326-527C-4284-AE2C-D1E25D539CEA} - astra_vc11 - - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - true - v110 - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - DynamicLibrary - false - v110 - true - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Debug_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda32D - true - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Debug_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda64D - true - - - $(SolutionDir)bin\$(Platform)\Debug\ - $(OutDir)obj\ - .dll - Astra32D - true - - - $(SolutionDir)bin\$(Platform)\Debug\ - $(OutDir)obj\ - .dll - Astra64D - true - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Release_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda32 - true - - - $(CUDA_INC_PATH);$(IncludePath) - $(CUDA_LIB_PATH);$(LibraryPath) - $(SolutionDir)bin\$(Platform)\Release_CUDA\ - $(OutDir)obj\ - .dll - AstraCuda64 - true - - - $(SolutionDir)bin\$(Platform)\Release\ - $(OutDir)obj\ - .dll - Astra32 - true - - - $(SolutionDir)bin\$(Platform)\Release\ - $(OutDir)obj\ - .dll - Astra64 - true - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\Win32\Debug_CUDA\AstraCuda32D.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 32 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\x64\Debug_CUDA\AstraCuda64D.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 64 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\Win32\Debug\Astra32D.dll - lib\win32;%(AdditionalLibraryDirectories) - - - - - MultiThreadedDebugDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - bin\x64\Debug\Astra64D.dll - lib\x64;%(AdditionalLibraryDirectories) - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - true - true - AnySuitable - Speed - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\Win32\Release_CUDA\AstraCuda32.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 32 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - MaxSpeed - true - true - AnySuitable - Speed - ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\x64\Release_CUDA\AstraCuda64.dll - cudart.lib;cufft.lib;%(AdditionalDependencies) - lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) - - - 64 - true - compute_20,sm_20;compute_30,sm_30;compute_30,sm_35;compute_30,compute_30 - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - true - true - AnySuitable - Speed - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\Win32\Release\Astra32.dll - lib\win32;%(AdditionalLibraryDirectories) - - - - - MultiThreadedDLL - Level3 - lib\include;include\;%(AdditionalIncludeDirectories) - true - MaxSpeed - true - true - AnySuitable - Speed - __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - true - - - true - true - true - bin\x64\Release\Astra64.dll - lib\x64;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - true - true - true - true - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/astra_vc11.vcxproj.filters b/astra_vc11.vcxproj.filters deleted file mode 100644 index dd7f574..0000000 --- a/astra_vc11.vcxproj.filters +++ /dev/null @@ -1,766 +0,0 @@ - - - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - CUDA\cuda source - - - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Algorithms\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Data Structures\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Global & Other\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Geometries\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - Projectors\source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - CUDA\astra source - - - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Algorithms\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Data Structures\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Global & Other\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Geometries\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - Projectors\headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\astra headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - CUDA\cuda headers - - - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - Projectors\inline - - - - - {262b0d17-774a-4cb1-b51a-b358d2d02791} - - - {76d6d672-670b-4454-b3ab-10dc8f9b8710} - - - {77a581a9-60da-4265-97c0-80cdf97408c0} - - - {c1af0e56-5fcc-4e75-b5db-88eeb4148185} - - - {72fbe846-10ef-4c52-88df-13bd66c4cbfc} - - - {7ef37c12-c98c-4dd6-938d-12f49279eae0} - - - {a76ffd6d-3895-4365-b27e-fc9a72f2ed75} - - - {9df653ab-26c3-4bec-92a2-3dda22fda761} - - - {444c44b0-6454-483a-be26-7cb9c8ab0b98} - - - {95346487-8185-487b-a794-3e7fb5fcbd4c} - - - {1c52efc8-a77e-4c72-b9be-f6429a87e6d7} - - - {1546cb47-7e5b-42c2-b695-ef172024c14b} - - - {eddb31ba-0db7-4ab1-a490-36623aaf8901} - - - {dc27bff7-4256-4311-a131-47612a44af20} - - - {91ae2cfd-6b45-46eb-ad99-2f16e5ce4b1e} - - - {0daffd63-ba49-4a5f-8d7a-5322e0e74f22} - - - {2d60e3c8-7874-4cee-b139-991ac15e811d} - - - {bd4e1f94-2f56-4db6-b946-20c29d65a351} - - - {bbef012e-598a-456f-90d8-416bdcb4221c} - - - {4e17872e-db7d-41bc-9760-fad1c253b583} - - - {04a878ed-77b4-4525-9bc2-38ccd65282c5} - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_algorithm_vc09.vcproj b/matlab/mex/astra_mex_algorithm_vc09.vcproj deleted file mode 100644 index d5cebc0..0000000 --- a/matlab/mex/astra_mex_algorithm_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_algorithm_vc11.vcxproj b/matlab/mex/astra_mex_algorithm_vc11.vcxproj deleted file mode 100644 index c133e26..0000000 --- a/matlab/mex/astra_mex_algorithm_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_algorithm - {056BF7A9-294D-487C-8CC3-BE629077CA94} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_data2d_vc09.vcproj b/matlab/mex/astra_mex_data2d_vc09.vcproj deleted file mode 100644 index 2c8a63f..0000000 --- a/matlab/mex/astra_mex_data2d_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_data2d_vc11.vcxproj b/matlab/mex/astra_mex_data2d_vc11.vcxproj deleted file mode 100644 index 636780a..0000000 --- a/matlab/mex/astra_mex_data2d_vc11.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_data2d - {E4092269-B19C-46F7-A84E-4F146CC70E44} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_data3d_vc09.vcproj b/matlab/mex/astra_mex_data3d_vc09.vcproj deleted file mode 100644 index fd861a3..0000000 --- a/matlab/mex/astra_mex_data3d_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_data3d_vc11.vcxproj b/matlab/mex/astra_mex_data3d_vc11.vcxproj deleted file mode 100644 index 1c3c620..0000000 --- a/matlab/mex/astra_mex_data3d_vc11.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_data3d - {0BEC029B-0929-4BF9-BD8B-9C9806A52065} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_direct_vc09.vcproj b/matlab/mex/astra_mex_direct_vc09.vcproj deleted file mode 100644 index 5d27c65..0000000 --- a/matlab/mex/astra_mex_direct_vc09.vcproj +++ /dev/null @@ -1,628 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_direct_vc11.vcxproj b/matlab/mex/astra_mex_direct_vc11.vcxproj deleted file mode 100644 index bc2db62..0000000 --- a/matlab/mex/astra_mex_direct_vc11.vcxproj +++ /dev/null @@ -1,310 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_direct - {0F68F4E2-BE1B-4A9A-B101-AECF4C069CC7} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_file_vc11.vcxproj b/matlab/mex/astra_mex_file_vc11.vcxproj deleted file mode 100644 index 04925fe..0000000 --- a/matlab/mex/astra_mex_file_vc11.vcxproj +++ /dev/null @@ -1,289 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_file - {649115B5-795E-4FCB-BFFE-ED3F07288060} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - - Astra32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDLL - true - - - Astra64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - AstraCuda32.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - MaxSpeed - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\lib\include\cuda;..\..\include\;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - AstraCuda64.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - - - - - Disabled - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - true - EditAndContinue - - - AstraCuda32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - X64 - - - Disabled - $(CUDA_INC_PATH);$(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - ASTRA_CUDA;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - true - true - EditAndContinue - - - AstraCuda64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - MachineX64 - - - - - Disabled - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - true - EditAndContinue - - - Astra32D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw32 - ..\..\bin\win32;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - X64 - - - Disabled - $(MATLAB_ROOT)\extern\include\;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - true - - - Astra64D.lib;libmex.lib;libmx.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName)_c.mexw64 - ..\..\bin\x64;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - MachineX64 - - - - - - - true - - - - - - - true - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_log_vc09.vcproj b/matlab/mex/astra_mex_log_vc09.vcproj deleted file mode 100644 index 0e0d469..0000000 --- a/matlab/mex/astra_mex_log_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_log_vc11.vcxproj b/matlab/mex/astra_mex_log_vc11.vcxproj deleted file mode 100644 index 0a939cf..0000000 --- a/matlab/mex/astra_mex_log_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_log - {03B833F5-4FD6-4FBE-AAF4-E3305CD56D2E} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_matrix_vc09.vcproj b/matlab/mex/astra_mex_matrix_vc09.vcproj deleted file mode 100644 index 3aa17a5..0000000 --- a/matlab/mex/astra_mex_matrix_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_matrix_vc11.vcxproj b/matlab/mex/astra_mex_matrix_vc11.vcxproj deleted file mode 100644 index abf86a7..0000000 --- a/matlab/mex/astra_mex_matrix_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_matrix - {9D041710-2119-4230-BCF2-5FBE753FDE49} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector3d_vc09.vcproj b/matlab/mex/astra_mex_projector3d_vc09.vcproj deleted file mode 100644 index b9464a2..0000000 --- a/matlab/mex/astra_mex_projector3d_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_projector3d_vc11.vcxproj b/matlab/mex/astra_mex_projector3d_vc11.vcxproj deleted file mode 100644 index 42eb0f1..0000000 --- a/matlab/mex/astra_mex_projector3d_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_projector3d - {F94CCD79-AA11-42DF-AC8A-6C9D2238A883} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector_vc09.vcproj b/matlab/mex/astra_mex_projector_vc09.vcproj deleted file mode 100644 index 05c207f..0000000 --- a/matlab/mex/astra_mex_projector_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_projector_vc11.vcxproj b/matlab/mex/astra_mex_projector_vc11.vcxproj deleted file mode 100644 index e944949..0000000 --- a/matlab/mex/astra_mex_projector_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex_projector - {4DD6056F-8EEE-4C9A-B2A9-923F01A32E97} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/matlab/mex/astra_mex_vc09.vcproj b/matlab/mex/astra_mex_vc09.vcproj deleted file mode 100644 index e4d7d07..0000000 --- a/matlab/mex/astra_mex_vc09.vcproj +++ /dev/null @@ -1,612 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/matlab/mex/astra_mex_vc11.vcxproj b/matlab/mex/astra_mex_vc11.vcxproj deleted file mode 100644 index f1324b4..0000000 --- a/matlab/mex/astra_mex_vc11.vcxproj +++ /dev/null @@ -1,306 +0,0 @@ - - - - - Debug_CUDA - Win32 - - - Debug_CUDA - x64 - - - Debug - Win32 - - - Debug - x64 - - - Release_CUDA - Win32 - - - Release_CUDA - x64 - - - Release - Win32 - - - Release - x64 - - - - astra_mex - {3FDA35E0-0D54-4663-A3E6-5ABA96F32221} - astraMatlab - - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - DynamicLibrary - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.60610.1 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw32 - - - $(SolutionDir)bin\$(Platform)\$(Configuration)\ - $(OutDir)obj\$(ProjectName)\ - $(ProjectName)_c - .mexw64 - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDebugDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - Disabled - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - StreamingSIMDExtensions2 - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw32 - Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - MultiThreadedDLL - $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) - true - MaxSpeed - __SSE2__;%(PreprocessorDefinitions) - true - - - $(OutDir)$(ProjectName)_c.mexw64 - Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) - ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) - mex.def - true - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3 From 09032e9dc99a7931f0d26f56322f8406d5462643 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 12:14:33 +0100 Subject: Add VS2015 build files --- astra_vc14.sln | 245 ++++++++ astra_vc14.vcxproj | 849 ++++++++++++++++++++++++++ astra_vc14.vcxproj.filters | 766 +++++++++++++++++++++++ matlab/mex/astra_mex_algorithm_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_data2d_vc14.vcxproj | 310 ++++++++++ matlab/mex/astra_mex_data3d_vc14.vcxproj | 310 ++++++++++ matlab/mex/astra_mex_direct_vc14.vcxproj | 310 ++++++++++ matlab/mex/astra_mex_log_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_matrix_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_projector3d_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_projector_vc14.vcxproj | 306 ++++++++++ matlab/mex/astra_mex_vc14.vcxproj | 306 ++++++++++ 12 files changed, 4626 insertions(+) create mode 100644 astra_vc14.sln create mode 100644 astra_vc14.vcxproj create mode 100644 astra_vc14.vcxproj.filters create mode 100644 matlab/mex/astra_mex_algorithm_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_data2d_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_data3d_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_direct_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_log_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_matrix_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_projector3d_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_projector_vc14.vcxproj create mode 100644 matlab/mex/astra_mex_vc14.vcxproj diff --git a/astra_vc14.sln b/astra_vc14.sln new file mode 100644 index 0000000..767366b --- /dev/null +++ b/astra_vc14.sln @@ -0,0 +1,245 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_vc14", "astra_vc14.vcxproj", "{DABD9D82-609E-4C71-B1CA-A41B07495290}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "astra_mex", "astra_mex", "{2076FB73-ECFE-4B1B-9A8C-E351C500FAAB}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex", "matlab\mex\astra_mex_vc14.vcxproj", "{6FDF72C4-A855-4F1C-A401-6500040B5E28}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_algorithm", "matlab\mex\astra_mex_algorithm_vc14.vcxproj", "{CE5EF874-830C-4C10-8651-CCA2A34ED9E4}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data2d", "matlab\mex\astra_mex_data2d_vc14.vcxproj", "{D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_data3d", "matlab\mex\astra_mex_data3d_vc14.vcxproj", "{2A7084C6-62ED-4235-85F4-094C17689DEB}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_matrix", "matlab\mex\astra_mex_matrix_vc14.vcxproj", "{6BFA8857-37EB-4E43-A97C-B860E21599F5}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector", "matlab\mex\astra_mex_projector_vc14.vcxproj", "{85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_projector3d", "matlab\mex\astra_mex_projector3d_vc14.vcxproj", "{CA85BDA0-9BDD-495E-B200-BFE863EB6318}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_log", "matlab\mex\astra_mex_log_vc14.vcxproj", "{88539382-66DB-4BBC-A48E-8B6B3CA6064F}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "astra_mex_direct", "matlab\mex\astra_mex_direct_vc14.vcxproj", "{47460476-912B-4313-8B10-BDF1D60A84C4}" + ProjectSection(ProjectDependencies) = postProject + {DABD9D82-609E-4C71-B1CA-A41B07495290} = {DABD9D82-609E-4C71-B1CA-A41B07495290} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_CUDA|Win32 = Debug_CUDA|Win32 + Debug_CUDA|x64 = Debug_CUDA|x64 + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release_CUDA|Win32 = Release_CUDA|Win32 + Release_CUDA|x64 = Release_CUDA|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|Win32.ActiveCfg = Debug|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|Win32.Build.0 = Debug|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|x64.ActiveCfg = Debug|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Debug|x64.Build.0 = Debug|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|Win32.ActiveCfg = Release|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|Win32.Build.0 = Release|Win32 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|x64.ActiveCfg = Release|x64 + {DABD9D82-609E-4C71-B1CA-A41B07495290}.Release|x64.Build.0 = Release|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|Win32.ActiveCfg = Debug|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|Win32.Build.0 = Debug|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|x64.ActiveCfg = Debug|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Debug|x64.Build.0 = Debug|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|Win32.ActiveCfg = Release|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|Win32.Build.0 = Release|Win32 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|x64.ActiveCfg = Release|x64 + {6FDF72C4-A855-4F1C-A401-6500040B5E28}.Release|x64.Build.0 = Release|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|Win32.Build.0 = Debug|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|x64.ActiveCfg = Debug|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Debug|x64.Build.0 = Debug|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|Win32.ActiveCfg = Release|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|Win32.Build.0 = Release|Win32 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|x64.ActiveCfg = Release|x64 + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4}.Release|x64.Build.0 = Release|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|Win32.ActiveCfg = Debug|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|Win32.Build.0 = Debug|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|x64.ActiveCfg = Debug|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Debug|x64.Build.0 = Debug|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|Win32.ActiveCfg = Release|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|Win32.Build.0 = Release|Win32 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|x64.ActiveCfg = Release|x64 + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1}.Release|x64.Build.0 = Release|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|Win32.ActiveCfg = Debug|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|Win32.Build.0 = Debug|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|x64.ActiveCfg = Debug|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Debug|x64.Build.0 = Debug|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|Win32.ActiveCfg = Release|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|Win32.Build.0 = Release|Win32 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|x64.ActiveCfg = Release|x64 + {2A7084C6-62ED-4235-85F4-094C17689DEB}.Release|x64.Build.0 = Release|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|Win32.ActiveCfg = Debug|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|Win32.Build.0 = Debug|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|x64.ActiveCfg = Debug|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Debug|x64.Build.0 = Debug|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|Win32.ActiveCfg = Release|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|Win32.Build.0 = Release|Win32 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|x64.ActiveCfg = Release|x64 + {6BFA8857-37EB-4E43-A97C-B860E21599F5}.Release|x64.Build.0 = Release|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|Win32.ActiveCfg = Debug|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|Win32.Build.0 = Debug|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|x64.ActiveCfg = Debug|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Debug|x64.Build.0 = Debug|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|Win32.ActiveCfg = Release|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|Win32.Build.0 = Release|Win32 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|x64.ActiveCfg = Release|x64 + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2}.Release|x64.Build.0 = Release|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|Win32.ActiveCfg = Debug|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|Win32.Build.0 = Debug|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|x64.ActiveCfg = Debug|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Debug|x64.Build.0 = Debug|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|Win32.ActiveCfg = Release|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|Win32.Build.0 = Release|Win32 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|x64.ActiveCfg = Release|x64 + {CA85BDA0-9BDD-495E-B200-BFE863EB6318}.Release|x64.Build.0 = Release|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|Win32.ActiveCfg = Debug|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|Win32.Build.0 = Debug|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|x64.ActiveCfg = Debug|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Debug|x64.Build.0 = Debug|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|Win32.ActiveCfg = Release|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|Win32.Build.0 = Release|Win32 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|x64.ActiveCfg = Release|x64 + {88539382-66DB-4BBC-A48E-8B6B3CA6064F}.Release|x64.Build.0 = Release|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|Win32.ActiveCfg = Debug_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|Win32.Build.0 = Debug_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|x64.ActiveCfg = Debug_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug_CUDA|x64.Build.0 = Debug_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|Win32.ActiveCfg = Debug|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|Win32.Build.0 = Debug|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|x64.ActiveCfg = Debug|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Debug|x64.Build.0 = Debug|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|Win32.ActiveCfg = Release_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|Win32.Build.0 = Release_CUDA|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|x64.ActiveCfg = Release_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release_CUDA|x64.Build.0 = Release_CUDA|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|Win32.ActiveCfg = Release|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|Win32.Build.0 = Release|Win32 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|x64.ActiveCfg = Release|x64 + {47460476-912B-4313-8B10-BDF1D60A84C4}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6FDF72C4-A855-4F1C-A401-6500040B5E28} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {2A7084C6-62ED-4235-85F4-094C17689DEB} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {6BFA8857-37EB-4E43-A97C-B860E21599F5} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {CA85BDA0-9BDD-495E-B200-BFE863EB6318} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {88539382-66DB-4BBC-A48E-8B6B3CA6064F} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + {47460476-912B-4313-8B10-BDF1D60A84C4} = {2076FB73-ECFE-4B1B-9A8C-E351C500FAAB} + EndGlobalSection +EndGlobal diff --git a/astra_vc14.vcxproj b/astra_vc14.vcxproj new file mode 100644 index 0000000..a28bbfa --- /dev/null +++ b/astra_vc14.vcxproj @@ -0,0 +1,849 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + {DABD9D82-609E-4C71-B1CA-A41B07495290} + astra_vc14 + + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + true + v140 + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + DynamicLibrary + false + v140 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)bin\$(Platform)\Debug_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda32D + true + + + $(SolutionDir)bin\$(Platform)\Debug_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda64D + true + + + $(SolutionDir)bin\$(Platform)\Debug\ + $(OutDir)obj\ + .dll + Astra32D + true + + + $(SolutionDir)bin\$(Platform)\Debug\ + $(OutDir)obj\ + .dll + Astra64D + true + + + $(SolutionDir)bin\$(Platform)\Release_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda32 + true + + + $(SolutionDir)bin\$(Platform)\Release_CUDA\ + $(OutDir)obj\ + .dll + AstraCuda64 + true + + + $(SolutionDir)bin\$(Platform)\Release\ + $(OutDir)obj\ + .dll + Astra32 + true + + + $(SolutionDir)bin\$(Platform)\Release\ + $(OutDir)obj\ + .dll + Astra64 + true + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\Win32\Debug_CUDA\AstraCuda32D.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 32 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\x64\Debug_CUDA\AstraCuda64D.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 64 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\Win32\Debug\Astra32D.dll + lib\win32;%(AdditionalLibraryDirectories) + + + + + MultiThreadedDebugDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + bin\x64\Debug\Astra64D.dll + lib\x64;%(AdditionalLibraryDirectories) + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + true + true + AnySuitable + Speed + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\Win32\Release_CUDA\AstraCuda32.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\win32;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 32 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + MaxSpeed + true + true + AnySuitable + Speed + ASTRA_CUDA;__SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\x64\Release_CUDA\AstraCuda64.dll + cudart.lib;cufft.lib;%(AdditionalDependencies) + lib\x64;%(AdditionalLibraryDirectories);$(CudaToolkitLibDir) + + + 64 + true + compute_20,sm_20;compute_30,sm_30;compute_35,sm_35;compute_50,sm_50;compute_60,sm_60;compute_60,compute_60 + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + true + true + AnySuitable + Speed + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\Win32\Release\Astra32.dll + lib\win32;%(AdditionalLibraryDirectories) + + + + + MultiThreadedDLL + Level3 + lib\include;include\;%(AdditionalIncludeDirectories) + true + MaxSpeed + true + true + AnySuitable + Speed + __SSE2__;DLL_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + true + + + true + true + true + bin\x64\Release\Astra64.dll + lib\x64;%(AdditionalLibraryDirectories) + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + true + true + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/astra_vc14.vcxproj.filters b/astra_vc14.vcxproj.filters new file mode 100644 index 0000000..dd7f574 --- /dev/null +++ b/astra_vc14.vcxproj.filters @@ -0,0 +1,766 @@ + + + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + CUDA\cuda source + + + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Algorithms\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Data Structures\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Global & Other\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Geometries\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + Projectors\source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + CUDA\astra source + + + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Algorithms\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Data Structures\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Global & Other\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Geometries\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + Projectors\headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\astra headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + CUDA\cuda headers + + + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + Projectors\inline + + + + + {262b0d17-774a-4cb1-b51a-b358d2d02791} + + + {76d6d672-670b-4454-b3ab-10dc8f9b8710} + + + {77a581a9-60da-4265-97c0-80cdf97408c0} + + + {c1af0e56-5fcc-4e75-b5db-88eeb4148185} + + + {72fbe846-10ef-4c52-88df-13bd66c4cbfc} + + + {7ef37c12-c98c-4dd6-938d-12f49279eae0} + + + {a76ffd6d-3895-4365-b27e-fc9a72f2ed75} + + + {9df653ab-26c3-4bec-92a2-3dda22fda761} + + + {444c44b0-6454-483a-be26-7cb9c8ab0b98} + + + {95346487-8185-487b-a794-3e7fb5fcbd4c} + + + {1c52efc8-a77e-4c72-b9be-f6429a87e6d7} + + + {1546cb47-7e5b-42c2-b695-ef172024c14b} + + + {eddb31ba-0db7-4ab1-a490-36623aaf8901} + + + {dc27bff7-4256-4311-a131-47612a44af20} + + + {91ae2cfd-6b45-46eb-ad99-2f16e5ce4b1e} + + + {0daffd63-ba49-4a5f-8d7a-5322e0e74f22} + + + {2d60e3c8-7874-4cee-b139-991ac15e811d} + + + {bd4e1f94-2f56-4db6-b946-20c29d65a351} + + + {bbef012e-598a-456f-90d8-416bdcb4221c} + + + {4e17872e-db7d-41bc-9760-fad1c253b583} + + + {04a878ed-77b4-4525-9bc2-38ccd65282c5} + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_algorithm_vc14.vcxproj b/matlab/mex/astra_mex_algorithm_vc14.vcxproj new file mode 100644 index 0000000..05b120f --- /dev/null +++ b/matlab/mex/astra_mex_algorithm_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_algorithm + {CE5EF874-830C-4C10-8651-CCA2A34ED9E4} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_data2d_vc14.vcxproj b/matlab/mex/astra_mex_data2d_vc14.vcxproj new file mode 100644 index 0000000..6c5dccc --- /dev/null +++ b/matlab/mex/astra_mex_data2d_vc14.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_data2d + {D2CDCDB3-7AD9-4853-8D87-BDB1DAD9C9C1} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_data3d_vc14.vcxproj b/matlab/mex/astra_mex_data3d_vc14.vcxproj new file mode 100644 index 0000000..8a10af7 --- /dev/null +++ b/matlab/mex/astra_mex_data3d_vc14.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_data3d + {2A7084C6-62ED-4235-85F4-094C17689DEB} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_direct_vc14.vcxproj b/matlab/mex/astra_mex_direct_vc14.vcxproj new file mode 100644 index 0000000..c17d49b --- /dev/null +++ b/matlab/mex/astra_mex_direct_vc14.vcxproj @@ -0,0 +1,310 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_direct + {47460476-912B-4313-8B10-BDF1D60A84C4} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_log_vc14.vcxproj b/matlab/mex/astra_mex_log_vc14.vcxproj new file mode 100644 index 0000000..bb7ccb6 --- /dev/null +++ b/matlab/mex/astra_mex_log_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_log + {88539382-66DB-4BBC-A48E-8B6B3CA6064F} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_matrix_vc14.vcxproj b/matlab/mex/astra_mex_matrix_vc14.vcxproj new file mode 100644 index 0000000..389e516 --- /dev/null +++ b/matlab/mex/astra_mex_matrix_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_matrix + {6BFA8857-37EB-4E43-A97C-B860E21599F5} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector3d_vc14.vcxproj b/matlab/mex/astra_mex_projector3d_vc14.vcxproj new file mode 100644 index 0000000..5c56221 --- /dev/null +++ b/matlab/mex/astra_mex_projector3d_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_projector3d + {CA85BDA0-9BDD-495E-B200-BFE863EB6318} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_projector_vc14.vcxproj b/matlab/mex/astra_mex_projector_vc14.vcxproj new file mode 100644 index 0000000..332fb4c --- /dev/null +++ b/matlab/mex/astra_mex_projector_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex_projector + {85ECCF1D-C5F6-4E0E-A4F9-0DE7C0B916B2} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/matlab/mex/astra_mex_vc14.vcxproj b/matlab/mex/astra_mex_vc14.vcxproj new file mode 100644 index 0000000..7ca3dbb --- /dev/null +++ b/matlab/mex/astra_mex_vc14.vcxproj @@ -0,0 +1,306 @@ + + + + + Debug_CUDA + Win32 + + + Debug_CUDA + x64 + + + Debug + Win32 + + + Debug + x64 + + + Release_CUDA + Win32 + + + Release_CUDA + x64 + + + Release + Win32 + + + Release + x64 + + + + astra_mex + {6FDF72C4-A855-4F1C-A401-6500040B5E28} + astraMatlab + + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + DynamicLibrary + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw32 + + + $(SolutionDir)bin\$(Platform)\$(Configuration)\ + $(OutDir)obj\$(ProjectName)\ + $(ProjectName)_c + .mexw64 + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Debug;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDebugDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + Disabled + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64D.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Debug;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + AstraCuda32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + ASTRA_CUDA;__SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + AstraCuda64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release_CUDA;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + StreamingSIMDExtensions2 + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw32 + Astra32.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\win32\;..\..\bin\win32\Release;$(MATLAB_ROOT)\extern\lib\win32\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + MultiThreadedDLL + $(MATLAB_ROOT)\extern\include\;$(CUDA_PATH)\include;..\..\lib\include;..\..\include;%(AdditionalIncludeDirectories) + true + MaxSpeed + __SSE2__;%(PreprocessorDefinitions) + true + + + $(OutDir)$(ProjectName)_c.mexw64 + Astra64.lib;libmex.lib;libmx.lib;libut.lib;%(AdditionalDependencies) + ..\..\lib\x64\;..\..\bin\x64\Release;$(MATLAB_ROOT)\extern\lib\win64\microsoft;%(AdditionalLibraryDirectories) + mex.def + true + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3 From 80d5397e251d8e12c8cd77efcacc54b9f7de3f0b Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Fri, 18 Nov 2016 16:53:17 +0100 Subject: Add automated Windows build scripts --- README.md | 31 +++++---- README.txt | 30 +++++---- build/msvc/build_clean.bat | 12 ++++ build/msvc/build_env.bat | 16 +++++ build/msvc/build_matlab.bat | 14 ++++ build/msvc/build_python27.bat | 28 ++++++++ build/msvc/build_python35.bat | 27 ++++++++ build/msvc/build_release.bat | 145 ++++++++++++++++++++++++++++++++++++++++++ build/msvc/build_setup.bat | 37 +++++++++++ 9 files changed, 318 insertions(+), 22 deletions(-) create mode 100644 build/msvc/build_clean.bat create mode 100644 build/msvc/build_env.bat create mode 100644 build/msvc/build_matlab.bat create mode 100644 build/msvc/build_python27.bat create mode 100644 build/msvc/build_python35.bat create mode 100644 build/msvc/build_release.bat create mode 100644 build/msvc/build_setup.bat diff --git a/README.md b/README.md index 6691d5f..43d92b4 100644 --- a/README.md +++ b/README.md @@ -70,21 +70,30 @@ make install This will install Astra into your current Python environment. -### Windows, from source using Visual Studio 2008 +### Windows, from source using Visual Studio 2015 -Requirements: Visual Studio 2008, boost, CUDA (driver+toolkit), matlab. -Note that a .zip with all required (and precompiled) boost files is - available from our website. +Requirements: Visual Studio 2015 (full or community), boost (recent), CUDA 8.0, + Matlab (R2012a or higher) and/or WinPython 2.7/3.x. + +Using the Visual Studio IDE: Set the environment variable MATLAB_ROOT to your matlab install location. -Open astra_vc08.sln in Visual Studio. -Select the appropriate solution configuration. - (typically Release_CUDA|win32 or Release_CUDA|x64) +Copy boost headers to lib\include\boost, and boost libraries to bin\x64. +Open astra_vc14.sln in Visual Studio. +Select the appropriate solution configuration (typically Release_CUDA|x64). Build the solution. -Install by copying AstraCuda32.dll or AstraCuda64.dll from bin/ and - all .mexw32 or .mexw64 files from bin/Release_CUDA or bin/Debug_CUDA - and the entire matlab/tools directory to a directory to be added to - your matlab path. +Install by copying AstraCuda64.dll and all .mexw64 files from + bin\x64\Release_CUDA and the entire matlab/tools directory to a directory + to be added to your matlab path. + + +Using .bat scripts in build\msvc: + +Edit build_env.bat and set up the correct directories. +Run build_setup.bat to automatically copy the boost headers and libraries. +For matlab: Run build_matlab.bat. The .dll and .mexw64 files will be in bin\x64\Release_Cuda. +For python 2.7/3.5: Run build_python27.bat or build_python35.bat. Astra will be directly installed into site-packages. + ## References diff --git a/README.txt b/README.txt index aec5282..1aa69e3 100644 --- a/README.txt +++ b/README.txt @@ -97,22 +97,30 @@ This will install Astra into your current Python environment. -Windows, from source using Visual Studio 2008: +Windows, from source using Visual Studio 2015: ----------------------------------------------- -Requirements: Visual Studio 2008, boost, CUDA (driver+toolkit), matlab. -Note that a .zip with all required (and precompiled) boost files is - available from our website. +Requirements: Visual Studio 2015 (full or community), boost (recent), CUDA 8.0, + Matlab (R2012a or higher) and/or WinPython 2.7/3.x. + +Using the Visual Studio IDE: Set the environment variable MATLAB_ROOT to your matlab install location. -Open astra_vc08.sln in Visual Studio. -Select the appropriate solution configuration. - (typically Release_CUDA|win32 or Release_CUDA|x64) +Copy boost headers to lib\include\boost, and boost libraries to bin\x64. +Open astra_vc14.sln in Visual Studio. +Select the appropriate solution configuration (typically Release_CUDA|x64). Build the solution. -Install by copying AstraCuda32.dll or AstraCuda64.dll from bin/ and - all .mexw32 or .mexw64 files from bin/Release_CUDA or bin/Debug_CUDA - and the entire matlab/tools directory to a directory to be added to - your matlab path. +Install by copying AstraCuda64.dll and all .mexw64 files from + bin\x64\Release_CUDA and the entire matlab/tools directory to a directory + to be added to your matlab path. + + +Using .bat scripts in build\msvc: + +Edit build_env.bat and set up the correct directories. +Run build_setup.bat to automatically copy the boost headers and libraries. +For matlab: Run build_matlab.bat. The .dll and .mexw64 files will be in bin\x64\Release_Cuda. +For python 2.7/3.5: Run build_python27.bat or build_python35.bat. Astra will be directly installed into site-packages. References: diff --git a/build/msvc/build_clean.bat b/build/msvc/build_clean.bat new file mode 100644 index 0000000..4525529 --- /dev/null +++ b/build/msvc/build_clean.bat @@ -0,0 +1,12 @@ +@echo off + +set MATLAB_ROOT=C:\Program Files\MATLAB\R2015a + +call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat" + +cd %~dp0 +cd ..\.. + +msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:clean + +pause diff --git a/build/msvc/build_env.bat b/build/msvc/build_env.bat new file mode 100644 index 0000000..458209a --- /dev/null +++ b/build/msvc/build_env.bat @@ -0,0 +1,16 @@ +set B_WP27=2.7.10.3 +set B_WP35=3.5.2.3 +set B_WINPYTHON27=D:\wjp\WinPython-64bit-%B_WP27% +set B_WINPYTHON35=D:\wjp\WinPython-64bit-%B_WP35% +set B_MATLAB_ROOT=C:\Program Files\MATLAB\R2015a +set B_VC=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64 +set B_BV=1_62 +set B_BOOST=D:\wjp\boost_%B_BV%_0 + +set B_VCREDIST=D:\wjp\vs2015u3_redist\vc_redist.x64.exe + +set B_README_WP27=C:\WinPython-64bit-%B_WP27%\python-%B_WP27:~0,-2%.amd64\Lib\site-packages +set B_README_WP35=C:\WinPython-64bit-%B_WP35%\python-%B_WP35:~0,-2%.amd64\Lib\site-packages + +set B_RELEASE_TAG=v1.7.1 +set B_RELEASE=1.7.1beta diff --git a/build/msvc/build_matlab.bat b/build/msvc/build_matlab.bat new file mode 100644 index 0000000..7a2ef79 --- /dev/null +++ b/build/msvc/build_matlab.bat @@ -0,0 +1,14 @@ +@echo off + +call "%~dp0build_env.bat" + +call "%B_VC%\vcvars64.bat" + +cd /D %~dp0 +cd ..\.. + +set MATLAB_ROOT=%B_MATLAB_ROOT% + +msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 + +pause diff --git a/build/msvc/build_python27.bat b/build/msvc/build_python27.bat new file mode 100644 index 0000000..a9495f0 --- /dev/null +++ b/build/msvc/build_python27.bat @@ -0,0 +1,28 @@ +@echo off + +cd /D %~dp0 +cd ..\.. +set R=%CD% + +call "%~dp0build_env.bat" + +call "%B_WINPYTHON27%\scripts\env.bat" +call "%B_VC%\vcvars64.bat" + +cd /D %R% + +msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 + +cd python + +rd /s /q build +rd /s /q "%WINPYDIR%\lib\site-packages\astra" + +set VS90COMNTOOLS=%VS140COMNTOOLS% +set CL=/DASTRA_CUDA /DASTRA_PYTHON /EHsc +set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include +copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib +python builder.py build_ext --compiler=msvc install +copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra" + +pause diff --git a/build/msvc/build_python35.bat b/build/msvc/build_python35.bat new file mode 100644 index 0000000..72c6ec4 --- /dev/null +++ b/build/msvc/build_python35.bat @@ -0,0 +1,27 @@ +@echo off + +cd /D %~dp0 +cd ..\.. +set R=%CD% + +call "%~dp0build_env.bat" + +call "%B_WINPYTHON35%\scripts\env.bat" +call "%B_VC%\vcvars64.bat" + +cd /D %R% + +msbuild astra_vc14.sln /p:Configuration=Release_CUDA /p:Platform=x64 /t:astra_vc14 + +cd python + +rd /s /q build +rd /s /q "%WINPYDIR%\lib\site-packages\astra" + +set CL=/DASTRA_CUDA /DASTRA_PYTHON +set INCLUDE=%R%\include;%R%\lib\include;%CUDA_PATH%\include +copy ..\bin\x64\Release_CUDA\AstraCuda64.lib astra.lib +python builder.py build_ext --compiler=msvc install +copy ..\bin\x64\Release_CUDA\AstraCuda64.dll "%WINPYDIR%\lib\site-packages\astra" + +pause diff --git a/build/msvc/build_release.bat b/build/msvc/build_release.bat new file mode 100644 index 0000000..87bfb28 --- /dev/null +++ b/build/msvc/build_release.bat @@ -0,0 +1,145 @@ +@echo off + +cd /D %~dp0 +cd ..\.. + +set R=%CD% + +call "%~dp0build_env.bat" + +rd /s /q release + +mkdir release +cd release +mkdir src +mkdir matlab +mkdir python27 +mkdir python35 + +cd src +git clone https://github.com/astra-toolbox/astra-toolbox astra-%B_RELEASE% +cd astra-%B_RELEASE% +git checkout %B_RELEASE_TAG% +rd /s /q .git + +pause + +cd %R%\release\matlab +mkdir astra-%B_RELEASE% +cd astra-%B_RELEASE% +xcopy /e /i %R%\samples\matlab samples +xcopy /e /i %R%\matlab\algorithms algorithms +xcopy /e /i %R%\matlab\tools tools +copy %R%\NEWS.txt . +copy %R%\README.txt . +copy %R%\COPYING COPYING.txt + +copy %B_VCREDIST% . + +mkdir mex +copy %R%\bin\x64\Release_CUDA\*.mexw64 mex +copy %R%\bin\x64\Release_CUDA\AstraCuda64.dll mex +copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib mex +copy "%CUDA_PATH%\bin\cudart64_80.dll" mex +copy "%CUDA_PATH%\bin\cufft64_80.dll" mex + +pause + +rem ------------------------------------------------------------------- + +cd %R%\release\python27 +mkdir astra-%B_RELEASE% +cd astra-%B_RELEASE% +xcopy /e /i %R%\samples\python samples +copy %R%\NEWS.txt . +copy %R%\COPYING COPYING.txt + +copy %B_VCREDIST% . + +mkdir astra +call "%B_WINPYTHON27%\scripts\env.bat" +copy %WINPYDIR%\lib\site-packages\astra\*.* astra +copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra +copy "%CUDA_PATH%\bin\cudart64_80.dll" astra +copy "%CUDA_PATH%\bin\cufft64_80.dll" astra + +( +echo ----------------------------------------------------------------------- +echo This file is part of the ASTRA Toolbox +echo. +echo Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +echo 2014-2016, CWI, Amsterdam +echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/ +echo License: Open Source under GPLv3 +echo Contact: astra@uantwerpen.be +echo Website: http://www.astra-toolbox.com/ +echo ----------------------------------------------------------------------- +echo. +echo. +echo This directory contains pre-built Python modules for the ASTRA Toolbox. +echo. +echo It has been built with WinPython-64bit-%B_WP27%. +echo. +echo To use it, move the astra\ directory to your existing site-packages directory. +echo Its exact location depends on your Python installation, but should look +echo similar to %B_README_WP27% . +echo. +echo Sample code can be found in the samples\ directory. +) > README.txt + +pause + +rem ------------------------------------------------------------------- + +cd %R%\release\python35 +mkdir astra-%B_RELEASE% +cd astra-%B_RELEASE% +xcopy /e /i %R%\samples\python samples +copy %R%\NEWS.txt . +copy %R%\COPYING COPYING.txt + +copy %B_VCREDIST% . + +mkdir astra +call "%B_WINPYTHON35%\scripts\env.bat" +copy %WINPYDIR%\lib\site-packages\astra\*.* astra +copy %R%\bin\x64\Release_CUDA\AstraCuda64.lib astra +copy "%CUDA_PATH%\bin\cudart64_80.dll" astra +copy "%CUDA_PATH%\bin\cufft64_80.dll" astra + +( +echo ----------------------------------------------------------------------- +echo This file is part of the ASTRA Toolbox +echo. +echo Copyright: 2010-2016, iMinds-Vision Lab, University of Antwerp +echo 2014-2016, CWI, Amsterdam +echo http://visielab.uantwerpen.be/ and http://www.cwi.nl/ +echo License: Open Source under GPLv3 +echo Contact: astra@uantwerpen.be +echo Website: http://www.astra-toolbox.com/ +echo ----------------------------------------------------------------------- +echo. +echo. +echo This directory contains pre-built Python modules for the ASTRA Toolbox. +echo. +echo It has been built with WinPython-64bit-%B_WP35%. +echo. +echo To use it, move the astra\ directory to your existing site-packages directory. +echo Its exact location depends on your Python installation, but should look +echo similar to %B_README_WP35% . +echo. +echo Sample code can be found in the samples\ directory. +) > README.txt + +pause + +cd %R%\release\matlab +python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-matlab-win-x64', 'zip', 'astra-%B_RELEASE%')" +cd %R%\release\python27 +python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python27-win-x64', 'zip', 'astra-%B_RELEASE%')" +cd %R%\release\python35 +python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%-python35-win-x64', 'zip', 'astra-%B_RELEASE%')" +cd %R%\release\src +python -c "import shutil; shutil.make_archive('astra-%B_RELEASE%', 'zip', 'astra-%B_RELEASE%')" + +pause diff --git a/build/msvc/build_setup.bat b/build/msvc/build_setup.bat new file mode 100644 index 0000000..4314386 --- /dev/null +++ b/build/msvc/build_setup.bat @@ -0,0 +1,37 @@ +@echo off + +call "%~dp0build_env.bat" + +cd /D %~dp0 +cd ..\.. +set R=%CD% + +rd /s /q "%R%\lib\x64" +rd /s /q "%R%\lib\include\boost" +rd /s /q "%R%\bin\x64\Release_CUDA" + +cd /D "%B_BOOST%\lib64-msvc-14.0" + +mkdir "%R%\lib\x64" +mkdir "%R%\bin\x64\Release_CUDA" + +copy boost_unit_test_framework-vc140-mt-%B_BV%.lib %R%\lib\x64 +copy boost_unit_test_framework-vc140-mt-gd-%B_BV%.lib %R%\lib\x64 + +copy libboost_chrono-vc140-mt-%B_BV%.lib %R%\lib\x64 +copy libboost_chrono-vc140-mt-gd-%B_BV%.lib %R%\lib\x64 + +copy libboost_date_time-vc140-mt-%B_BV%.lib %R%\lib\x64 +copy libboost_date_time-vc140-mt-gd-%B_BV%.lib %R%\lib\x64 + +copy libboost_system-vc140-mt-%B_BV%.lib %R%\lib\x64 +copy libboost_system-vc140-mt-gd-%B_BV%.lib %R%\lib\x64 + +copy libboost_thread-vc140-mt-%B_BV%.lib %R%\lib\x64 +copy libboost_thread-vc140-mt-gd-%B_BV%.lib %R%\lib\x64 + +cd %B_BOOST% + +xcopy /i /e /q boost "%R%\lib\include\boost" + +pause -- cgit v1.2.3