Commit b938e822 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Remove macros, remove reduction kernel name. Fix cpu diagnostic output. Update... 

Remove macros, remove reduction kernel name. Fix cpu diagnostic output. Update xcode build settings.
parent 869e7ab8

graph_framework.xcodeproj/project.pbxproj

+22 −14
Original line number Diff line number Diff line
@@ -3,15 +3,12 @@ 
	archiveVersion = 1;

	classes = {

	};

	objectVersion = 50;

	objectVersion = 53;

	objects = {



/* Begin PBXBuildFile section */

		C71342662947D57900672AD4 /* metal_context.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C71342652947D57900672AD4 /* metal_context.hpp */; };

		C713426A2947F39400672AD4 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C71342682947F36100672AD4 /* Metal.framework */; };

		C721EA9A2833FF7800EAFB2D /* equilibrium.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C721EA992833FF7800EAFB2D /* equilibrium.hpp */; };

		C79141B622DAAD0C00E0BA0D /* xrays.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C79141B522DAAD0C00E0BA0D /* xrays.cpp */; };

		C7B677D929E45C9500D3ADC6 /* backend.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C7B677D829E45C9500D3ADC6 /* backend.hpp */; };

		C7E5644528A2A1AA000F31A2 /* backend_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C7931E7328074F540033B488 /* backend_test.cpp */; };

		C7E5645128A2A1DD000F31A2 /* dispersion_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C7931E6B28073BCA0033B488 /* dispersion_test.cpp */; };

		C7E5645D28A2A21D000F31A2 /* solver_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C7931E6C28073BCA0033B488 /* solver_test.cpp */; };
@@ -340,9 +337,6 @@ 
			isa = PBXHeadersBuildPhase;

			buildActionMask = 2147483647;

			files = (

				C71342662947D57900672AD4 /* metal_context.hpp in Headers */,

				C7B677D929E45C9500D3ADC6 /* backend.hpp in Headers */,

				C721EA9A2833FF7800EAFB2D /* equilibrium.hpp in Headers */,

			);

			runOnlyForDeploymentPostprocessing = 0;

		};
@@ -542,7 +536,8 @@ 
		C791419E22DA9BF200E0BA0D /* Project object */ = {

			isa = PBXProject;

			attributes = {

				LastUpgradeCheck = 1420;

				BuildIndependentTargetsInParallel = YES;

				LastUpgradeCheck = 1430;

				ORGANIZATIONNAME = "Cianciosa, Mark R.";

				TargetAttributes = {

					C79141A522DA9BF200E0BA0D = {
@@ -743,9 +738,11 @@ 
				GCC_NO_COMMON_BLOCKS = YES;

				GCC_OPTIMIZATION_LEVEL = 0;

				GCC_PREPROCESSOR_DEFINITIONS = (

					USE_METAL,

					USE_REDUCE,

					"CXX=\\\"c++\\\"",

					"DEBUG=1",

					"$(inherited)",

					USE_METAL,

				);

				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -807,7 +804,12 @@ 
				ENABLE_STRICT_OBJC_MSGSEND = YES;

				GCC_C_LANGUAGE_STANDARD = gnu11;

				GCC_NO_COMMON_BLOCKS = YES;

				GCC_PREPROCESSOR_DEFINITIONS = USE_METAL;

				GCC_PREPROCESSOR_DEFINITIONS = (

					USE_METAL,

					USE_REDUCE,

					"CXX=\\\"c++\\\"",

					"$(inherited)",

				);

				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;

				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -834,6 +836,8 @@ 
				DEVELOPMENT_TEAM = 2M4J3Y9U5K;

				EXECUTABLE_PREFIX = lib;

				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";

				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";

				OTHER_LDFLAGS = "";

				PRODUCT_NAME = "$(TARGET_NAME)";

				SKIP_INSTALL = YES;

			};
@@ -847,6 +851,8 @@ 
				DEVELOPMENT_TEAM = 2M4J3Y9U5K;

				EXECUTABLE_PREFIX = lib;

				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";

				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";

				OTHER_LDFLAGS = "";

				PRODUCT_NAME = "$(TARGET_NAME)";

				SKIP_INSTALL = YES;

			};
@@ -859,7 +865,9 @@ 
				CODE_SIGN_STYLE = Automatic;

				DEAD_CODE_STRIPPING = YES;

				DEVELOPMENT_TEAM = "";

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";

				OTHER_CPLUSPLUSFLAGS = "-fsanitize=float-divide-by-zero";

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

			name = Debug;
@@ -871,7 +879,10 @@ 
				CODE_SIGN_STYLE = Automatic;

				DEAD_CODE_STRIPPING = YES;

				DEVELOPMENT_TEAM = "";

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";

				OTHER_CPLUSPLUSFLAGS = "";

				OTHER_LDFLAGS = "";

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

			name = Release;
@@ -1075,10 +1086,7 @@ 
				CODE_SIGN_IDENTITY = "-";

				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";

				CODE_SIGN_STYLE = Automatic;

				GCC_PREPROCESSOR_DEFINITIONS = (

					"DEBUG=1",

					"$(inherited)",

				);

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 12.6;

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

graph_framework.xcodeproj/xcshareddata/xcschemes/graph_driver.xcscheme

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Scheme

   LastUpgradeVersion = "1420"

   LastUpgradeVersion = "1430"

   version = "1.3">

   <BuildAction

      parallelizeBuildables = "YES"

graph_framework.xcodeproj/xcshareddata/xcschemes/math_test.xcscheme

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Scheme

   LastUpgradeVersion = "1420"

   LastUpgradeVersion = "1430"

   version = "1.3">

   <BuildAction

      parallelizeBuildables = "YES"

graph_framework.xcodeproj/xcshareddata/xcschemes/physics_test.xcscheme

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Scheme

   LastUpgradeVersion = "1420"

   LastUpgradeVersion = "1430"

   version = "1.3">

   <BuildAction

      parallelizeBuildables = "YES"

graph_framework/cpu_context.hpp

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ namespace gpu { 
#endif

            temp_stream << filename << " -o " << library_name;



            std::cout << "Metal GPU info." << std::endl;

            std::cout << "CPU info." << std::endl;

            std::cout << "  Command Line    : " << temp_stream.str() << std::endl;

            int error = system(temp_stream.str().c_str());

            if (error) {