Code

Merging in Keras 3 etc#7

Code

Merged

jezsadler merged 31 commits intoJuMPjezsadler/OMLT:JuMPfrom mainjezsadler/OMLT:mainCopy head branch name to clipboardMay 17, 2024

+2,844-1,754

Commits

Commits on Mar 19, 2024

• Merge branch 'cog-imperial:main' into main

  jezsadler

  authored
  4aaa2d9

  Copy full SHA for 4aaa2d9

• Merge pull request #4 from jezsadler/JuMP

  Show description for 9b872dc
  jezsadler

  authored
  9b872dc

  Copy full SHA for 9b872dc

• Create python-package.yml

  jezsadler

  authored
  3b19e4c

  Copy full SHA for 3b19e4c

Commits on Apr 22, 2024

• Update setup.cfg

  jezsadler

  authored
  83f5215

  Copy full SHA for 83f5215

Commits on May 6, 2024

• Merge branch 'cog-imperial:main' into main

  jezsadler

  authored
  5ee489e

  Copy full SHA for 5ee489e

Commits on May 8, 2024

• fix notebook; re-add workflow

  jalving

  committed
  3393d29

  Copy full SHA for 3393d29

• set tensorflow-cpu

  jalving

  committed
  f971048

  Copy full SHA for f971048

• fix keras version

  jalving

  committed
  dd3af9e

  Copy full SHA for dd3af9e

• fix linting

  jalving

  committed
  ab80670

  Copy full SHA for ab80670

• fix linting

  jalving

  committed
  d34bca5

  Copy full SHA for d34bca5

• fix gnn imports

  jalving

  committed
  b1a0c44

  Copy full SHA for b1a0c44

Commits on May 14, 2024

• Switching test models to Keras3 format

  jezsadler

  committed
  a54aa2b

  Copy full SHA for a54aa2b

• Switching test models to Keras3 format

  jezsadler

  committed
  01deb85

  Copy full SHA for 01deb85

• Fixed scaling NN block test

  jezsadler

  committed
  b7f082f

  Copy full SHA for b7f082f

• Updating keras imports in notebooks

  jezsadler

  committed
  2559fa3

  Copy full SHA for 2559fa3

Commits on May 16, 2024

• restrict pyomo to 6.6.2

  jalving

  committed
  0cba9b4

  Copy full SHA for 0cba9b4

• update codecov action

  jalving

  committed
  6961eb2

  Copy full SHA for 6961eb2

• fix linting again

  jalving

  committed
  9bf9fbc

  Copy full SHA for 9bf9fbc

• remove notebook folders

  jalving

  committed
  024f526

  Copy full SHA for 024f526

• Merge pull request cog-imperial#145 from jalving/jalving/re-add-workflows

  Show description for 5e20b1b
  jalving

  authored
  5e20b1b

  Copy full SHA for 5e20b1b

• Switching to Pyomo 6.2.2 and fixing notebooks

  jezsadler

  committed
  64ac469

  Copy full SHA for 64ac469

• Merge branch 'main' into keras3

  jezsadler

  authored
  d7b582a

  Copy full SHA for d7b582a

• Update setup.cfg

  jezsadler

  authored
  2d4f550

  Copy full SHA for 2d4f550

• Update setup.cfg to specify Keras 3 or later

  jezsadler

  authored
  3aaa3b3

  Copy full SHA for 3aaa3b3

• Updating supported Python versions to 3.9-3.12

  jezsadler

  authored
  ffce1ce

  Copy full SHA for ffce1ce

• Update main.yml to support Python 3.9-3.12

  jezsadler

  authored
  5cd55d6

  Copy full SHA for 5cd55d6

• Merge pull request cog-imperial#146 from jezsadler/keras3

  Show description for f9b5c8f
  jalving

  authored
  f9b5c8f

  Copy full SHA for f9b5c8f

• update codecov action

  jalving

  committed
  4fa34ec

  Copy full SHA for 4fa34ec

• Merge pull request cog-imperial#147 from jalving/jalving/update_codecov_action

  Show description for e605638
  jezsadler

  authored
  e605638

  Copy full SHA for e605638

Commits on May 17, 2024

• Update setup.cfg

  jezsadler

  authored
  b0c5ff1

  Copy full SHA for b0c5ff1

• Merge pull request #6 from cog-imperial/main

  Show description for bd8b9d7
  jezsadler

  authored
  bd8b9d7

  Copy full SHA for bd8b9d7