Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small AppveyorCI and CMAKE Fixes #128

Merged
merged 9 commits into from
Dec 15, 2017

Conversation

bemcdonnell
Copy link
Member

  • Trying to make the lights green (at least on Appveyor).

@bemcdonnell
Copy link
Member Author

bemcdonnell commented Dec 14, 2017

Some of the settings pulled from a fresh downloaded compiler from EPA's website related to the default Release Configuration... (Looks like it does use fast floating point model...).

VC2010-CLE

    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>

  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>


  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
      <Optimization>MaxSpeed</Optimization>
      <FunctionLevelLinking>true</FunctionLevelLinking>
      <IntrinsicFunctions>true</IntrinsicFunctions>
      <CompileAs>CompileAsC</CompileAs>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <OpenMPSupport>true</OpenMPSupport>
      <FloatingPointModel>Fast</FloatingPointModel>
      <FloatingPointExceptions>false</FloatingPointExceptions>
    </ClCompile>

VC2010-DLL

    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>

  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <IntrinsicFunctions>false</IntrinsicFunctions>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
      <WholeProgramOptimization>true</WholeProgramOptimization>
      <ExceptionHandling>
      </ExceptionHandling>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <StructMemberAlignment>Default</StructMemberAlignment>
      <FloatingPointModel>Fast</FloatingPointModel>
      <FloatingPointExceptions>false</FloatingPointExceptions>
      <DisableLanguageExtensions>false</DisableLanguageExtensions>
      <WarningLevel>Level4</WarningLevel>
      <CompileAs>CompileAsC</CompileAs>
      <OpenMPSupport>true</OpenMPSupport>
      <MultiProcessorCompilation>false</MultiProcessorCompilation>
    </ClCompile>

#set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin)
#set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change fixed Travis (For @michaeltryby).

@bemcdonnell bemcdonnell changed the title [WIP] Small CI and CMAKE Fixes Small CI and CMAKE Fixes Dec 15, 2017
@bemcdonnell bemcdonnell self-assigned this Dec 15, 2017
@bemcdonnell bemcdonnell added this to the v5.2.0 milestone Dec 15, 2017
@bemcdonnell
Copy link
Member Author

@goanpeca, I've turned off most of the build matrix. We're in the green for the Benchmark compiler!!! (There are issues with finding OpenMP). VS2010, (if I understand this correctly), only allowed paid subscribers to use openMP for VS2010.

@bemcdonnell bemcdonnell changed the title Small CI and CMAKE Fixes Small AppveyorCI and CMAKE Fixes Dec 15, 2017
@@ -15,26 +15,26 @@ environment:
# VS_VERSION: "9 2008"
# ARCH: Win64
# Python 3.4
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
Copy link

@goanpeca goanpeca Dec 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this image change @bemcdonnell ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@goanpeca, I suppose we don't have to.. I was experiementing with trying to get OpenMP to work on VS2010

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well.. it does not matter much, just wondering why.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want me to revert that change?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naahh

@bemcdonnell bemcdonnell merged commit a0ab55a into pyswmm:develop Dec 15, 2017
@bemcdonnell bemcdonnell deleted the fix_cmake_ci branch December 15, 2017 14:16
karosc pushed a commit that referenced this pull request Sep 1, 2023
karosc pushed a commit that referenced this pull request Sep 1, 2023
Use of wrong variable for iteration: Addresses #128
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants